407 files changed, 43001 insertions, 44973 deletions

diff --git a/AUTHORS b/AUTHORS
index 51e5321..1120a91 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,9 @@ Version 4.3 is being developed by essentially the same team.
 The list of contributors, in alphabetical order, is as follows.  The
 principal areas that each contributed to are listed in addition.
 
+Andreas Kemnade         <akemnade@tzi.de>
+        Cd printing support for Canon PIXMA printers
+
 Andy Stewart            <andystewart@attbi.com>
         User manual
 
@@ -65,6 +68,9 @@ Karl Heinz Kremer	<khk@khk.net>
 	Liaison with Epson
 	Engineering and design
 
+Karsten Festag		<karsten.festag@gmx.de>
+	Canon S200 support
+
 Mark Tomlinson		<mark.tomlinson@xtra.co.nz>
 	Implementation of Raph Levien's EvenTone dither
 
diff --git a/COPYING b/COPYING
index d60c31a..623b625 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/ChangeLog b/ChangeLog
index 270faa8..c1e23c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,334 @@
+2005-11-22	<rleigh@sourceforge.net>
+
+	Files:	doc/developer/Makefile.am (1.18) (+2 -2)
+		src/cups/Makefile.am (1.83) (+3 -3)
+		src/foomatic/Makefile.am (1.47) (+2 -2)
+
+	Replace the use of the deprecated $(mkinstalldirs) with $(mkdir_p).
+
+2005-11-21	<rleigh@sourceforge.net>
+
+	Files:	doc/README.maintaining (1.20) (+6 -12)
+
+	Update build tools version requirements.
+
+2005-11-21	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.250) (+6 -4)
+		src/foomatic/foomatic-printermap (1.103) (+1 -0)
+		src/main/printers.xml (1.135) (+8 -1)
+
+	Add Epson DX4200.
+
+2005-11-21	<rleigh@sourceforge.net>
+
+	Files:	Makefile.am (1.144) (+1 -4)
+		configure.ac (1.131) (+4 -4)
+		doc/Makefile.am (1.42) (+1 -5)
+		doc/developer/Makefile.am (1.17) (+1 -5)
+		doc/developer/using.xml (1.3) (+1 -4)
+		include/Makefile.am (1.7) (+1 -5)
+		include/gutenprint/Makefile.am (1.2) (+1 -5)
+		include/gutenprintui/Makefile.am (1.3) (+1 -5)
+		include/gutenprintui2/Makefile.am (1.3) (+1 -5)
+		man/Makefile.am (1.22) (+1 -5)
+		samples/Makefile.am (1.6) (+1 -5)
+		scripts/Makefile.am (1.5) (+1 -5)
+		src/Makefile.am (1.19) (+1 -5)
+		src/cups/Makefile.am (1.82) (+1 -5)
+		src/escputil/Makefile.am (1.20) (+0 -4)
+		src/foomatic/Makefile.am (1.46) (+1 -5)
+		src/ghost/Makefile.am (1.38) (+1 -5)
+		src/gimp/Makefile.am (1.36) (+1 -5)
+		src/gimp2/Makefile.am (1.6) (+1 -5)
+		src/gutenprintui/Makefile.am (1.5) (+1 -5)
+		src/gutenprintui2/Makefile.am (1.6) (+1 -5)
+		src/main/Makefile.am (1.92) (+1 -5)
+		src/testpattern/Makefile.am (1.23) (+1 -5)
+		test/Makefile.am (1.44) (+1 -5)
+
+	Makefile.am: Removed AUTOMAKE_OPTIONS and MAINT_CHARSET from all
+	             Makefile.am files.  These were obsolete with current
+		     automake versions.
+	configure.ac: Added automake options to AM_INIT_AUTOMAKE.
+	              Bumped version to -rc2 to match the version in NEWS.
+
+2005-10-30	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.84) (+2 -2)
+
+	Further slight improvement for photo quality inkjet paper.
+
+2005-10-30	<rlk@sourceforge.net>
+
+	Files:	src/main/escp2-papers.c (1.83) (+5 -5)
+
+	More tuning for R200 et al.
+
+2005-10-29	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.249) (+12 -2)
+		src/main/escp2-channels.c (1.58) (+3 -3)
+		src/main/escp2-papers.c (1.82) (+23 -23)
+		src/main/print-escp2-data.c (1.181) (+2 -2)
+
+	Retune the Epson Stylus Photo R200 and related printers.
+
+2005-10-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.248) (+12 -3)
+		src/foomatic/foomatic-printermap (1.102) (+3 -0)
+		src/main/printers.xml (1.134) (+13 -1)
+
+	Support Epson Stylus Photo R220, R320, and R340
+
+2005-10-28	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.247) (+9 -4)
+		src/foomatic/foomatic-printermap (1.101) (+2 -0)
+		src/main/printers.xml (1.133) (+9 -1)
+
+	Add support for Epson C68 and D68
+
+2005-10-26	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.246) (+34 -10)
+		src/gutenprintui2/plist.c (1.6) (+19 -15)
+		src/main/print-vars.c (1.74) (+58 -10)
+
+	Load the printrc file correctly in all locales.
+
+	Improve debug output.
+
+2005-10-23	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.245) (+2 -0)
+		src/foomatic/foomatic-printermap (1.100) (+1 -0)
+		src/main/escp2-channels.c (1.57) (+283 -20)
+		src/main/escp2-inks.c (1.42) (+28 -1)
+		src/main/escp2-papers.c (1.81) (+234 -1)
+		src/main/escp2-resolutions.c (1.29) (+11 -1)
+		src/main/print-dither-matrices.c (1.35) (+16 -8)
+		src/main/print-escp2-data.c (1.180) (+39 -2)
+		src/main/print-escp2.c (1.345) (+28 -17)
+		src/main/print-escp2.h (1.97) (+7 -2)
+		src/main/printers.xml (1.132) (+7 -3)
+		test/unprint.c (1.36) (+7 -2)
+
+	Add baseline support for Epson Stylus Photo R2400, with partial tuning.
+
+	Add transposed (720x1440 and 1440x2880) resolutions to Epson driver.
+	This may give better results in some cases.
+
+2005-10-21	<rlk@sourceforge.net>
+
+	Files:	COPYING (1.8) (+2 -2)
+
+	Update FSF address.
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	NEWS (1.244) (+1 -0)
+
+	DuplexTumble for iP4000
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.167) (+84 -6)
+
+	duplex support for the iP4000 (NoToumble not yet supported) patch by Andreas Kemnade <akemnade at tzi.de>
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	AUTHORS (1.21) (+3 -0)
+		NEWS (1.243) (+3 -0)
+
+	canon s200 support
+
+2005-10-21	<faust3@sourceforge.net>
+
+	Files:	src/foomatic/foomatic-printermap (1.99) (+1 -0)
+		src/main/print-canon.c (1.166) (+309 -21)
+		src/main/printers.xml (1.131) (+5 -1)
+
+	support for canon s200, patch by Karsten Festag <karsten.festag at gmx.de>
+
+2005-10-21	<m0m@sourceforge.net>
+
+	Files:	NEWS (1.242) (+6 -1)
+		src/foomatic/foomatic-printermap (1.98) (+4 -0)
+		src/main/print-olympus.c (1.57) (+113 -4)
+		src/main/printers.xml (1.130) (+3 -1)
+
+	- added code support for Sony UP-DR150
+	- added new Canon printers SELPHY CP-510, SELPHY CP-710
+	 (Canon CP-220 series)
+	- added Olympus P-11 (Olympus P-10 series)
+
+2005-10-18	<rlk@sourceforge.net>
+
+	Files:	include/gutenprint/color.h (1.2) (+7 -2)
+		include/gutenprint/curve-cache.h (1.2) (+2 -2)
+		include/gutenprint/image.h (1.2) (+4 -2)
+		src/cups/genppd.c (1.109) (+4 -4)
+		src/ghost/ijsgutenprint.c (1.11) (+3 -3)
+		src/main/curve-cache.c (1.6) (+2 -2)
+		src/main/path.c (1.18) (+2 -2)
+		src/main/print-escp2.h (1.96) (+3 -3)
+		src/main/print-olympus.c (1.56) (+3 -2)
+		src/main/print-pcl.c (1.140) (+2 -2)
+
+	Fix some miscellaneous warnings
+
+2005-10-10	<rlk@sourceforge.net>
+
+	Files:	src/main/print-ps.c (1.81) (+17 -4)
+
+	1304710 Postscript driver corrupts output if width not multiple of 4
+
+2005-10-06	<rlk@sourceforge.net>
+
+	Files:	src/gutenprintui2/panel.c (1.7) (+36 -30)
+		src/main/print-escp2.c (1.344) (+7 -3)
+
+	Print correctly if quadtone ink is selected in color mode (force
+	the mode to grayscale).
+
+2005-10-02	<rlk@sourceforge.net>
+
+	Files:	src/cups/genppd.c (1.108) (+2 -4)
+
+	Remove comment about initialize_stp_options (4.2 holdover).
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.241) (+7 -24)
+
+	Correct the list of printers for which four color mode is incompatible
+	with glossy paper, and remove specific blurb about resolutions on C80.
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.240) (+10 -3)
+
+	Note improvements to escputil.
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	src/escputil/escputil.c (1.76) (+84 -49)
+		src/foomatic/foomatic-printermap (1.97) (+6 -0)
+		src/main/printers.xml (1.129) (+37 -1)
+
+	Improve escputil -i and escputil -e by recognizing the ink output
+	of more printers.
+
+2005-10-01	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.239) (+14 -5)
+		src/foomatic/foomatic-printermap (1.96) (+4 -0)
+		src/main/printers.xml (1.128) (+23 -1)
+
+	Preliminary support for Epson Stylus CX-3700, CX-4700, CX-7700,
+	DX-3850, and DX-4800.
+
+2005-09-28	<faust3@sourceforge.net>
+
+	Files:	AUTHORS (1.20) (+3 -0)
+		NEWS (1.238) (+2 -0)
+
+	cd printing for pixma printer
+
+2005-09-28	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.165) (+127 -17)
+
+	CD label support for Canon PIXMA iP4000, patch by Andreas Kemnade <akemnade at tzi.de>
+
+2005-09-28	<faust3@sourceforge.net>
+
+	Files:	src/main/print-canon.c (1.164) (+24 -7)
+
+	attempt to fix offset handling for the 5 pixel in 1 byte compression, don't discard the last pixels when shiffting the buffer
+
+2005-09-18	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.237) (+7 -3)
+		src/foomatic/foomatic-printermap (1.95) (+3 -1)
+		src/main/printers.xml (1.127) (+15 -5)
+
+	Support a few more UK models
+
+2005-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.236) (+27 -2)
+		src/foomatic/foomatic-printermap (1.94) (+8 -0)
+		src/main/print-escp2-data.c (1.179) (+18 -1)
+		src/main/printers.xml (1.126) (+45 -1)
+
+	  5) Preliminary support for the Epson Stylus C87, C88, CX3800,
+	     CX3810, CX4200, CX4800, CX5800, CX7800, and DX3800.  These
+	     printers are expected to be fully functional (for the
+	     multi-function devices, this package supports only the printer
+	     function).
+
+	  7) Experimental support for the Epson Stylus Photo RX700.  This
+	     printer may or may not function correctly, and is not likely to
+	     be properly tuned.
+
+2005-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.235) (+18 -142)
+		src/gutenprintui/gutenprintui-internal.h (1.2) (+2 -1)
+		src/gutenprintui/panel.c (1.5) (+176 -43)
+		src/gutenprintui2/gutenprintui-internal.h (1.3) (+2 -1)
+		src/gutenprintui2/panel.c (1.6) (+177 -43)
+		src/main/color-conversion.h (1.11) (+2 -1)
+		src/main/print-color.c (1.132) (+100 -45)
+		src/main/print-ps.c (1.80) (+3 -1)
+		src/main/print-raw.c (1.37) (+2 -1)
+
+	  1) The Postscript driver now produces more accurate colors.
+	     Previous releases produced overly pale colors with the default
+	     settings.
+
+	  2) The Postscript driver now accepts red, green, and blue rather
+	     than cyan, magenta, and yellow options.
+
+	  3) The GIMP plugin now offers improved choices in the color
+	     adjustment window for viewing individual channels of the output.
+	     It now offers red/green/blue, cyan/magenta/yellow, or
+	     cyan/magenta/yellow/black as appropriate.
+
+	  4) The GIMP plugin is now significantly more responsive.
+
+2005-09-17	<rlk@sourceforge.net>
+
+	Files:	NEWS (1.234) (+2 -0)
+		src/foomatic/foomatic-printermap (1.93) (+2 -0)
+		src/main/printers.xml (1.125) (+9 -1)
+
+	Add Epson CX3800
+
+2005-09-02	<rlk@sourceforge.net>
+
+	Files:	po/cs.po (1.30) (+147 -142)
+		po/da.po (1.59) (+733 -639)
+		po/de.po (1.44) (+147 -142)
+		po/el.po (1.45) (+147 -142)
+		po/en_GB.po (1.136) (+147 -142)
+		po/es.po (1.43) (+147 -142)
+		po/fr.po (1.65) (+147 -142)
+		po/ja.po (1.39) (+147 -142)
+		po/nb.po (1.6) (+147 -142)
+		po/nl.po (1.45) (+147 -142)
+		po/pl.po (1.49) (+147 -142)
+		po/pt.po (1.43) (+147 -142)
+		po/sk.po (1.48) (+147 -142)
+		po/sv.po (1.75) (+148 -143)
+		po/zh_TW.po (1.3) (+147 -142)
+
+	Gutenprint 5.0.0-rc1 release
+
 2005-08-27	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.233) (+5 -5)
@@ -609,14 +940,6 @@
 
 2005-05-17	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/history.sgml (1.4) (+7 -7)
-		doc/users_guide/users-guide.sgml (1.9) (+2 -2)
-
-	Fix project name in the project history chapter.
-	Fix the manual title.
-
-2005-05-17	<rleigh@sourceforge.net>
-
 	Files:	configure.ac (1.124) (+3 -3)
 		po/nb.po (1.2) (+5746 -0)
 
@@ -1456,7 +1779,6 @@
 
 	Files:	.cvsignore (1.24) (+1 -0)
 		doc/developer/Makefile.am (1.16) (+3 -3)
-		doc/users_guide/Makefile.am (1.42) (+9 -9)
 		scripts/.cvsignore (1.4) (+2 -0)
 		scripts/autogen.sh (1.33) (+1 -1)
 
@@ -1722,16 +2044,6 @@
 		doc/developer/using.xml (1.2) (+34 -34)
 		doc/developer/weave.xml (1.2) (+1 -1)
 		doc/gutenprint.dox.in (1.1) ( )
-		doc/users_guide/README (1.7) (+1 -1)
-		doc/users_guide/cups-edition.sgml (1.2) (+5 -5)
-		doc/users_guide/cups.sgml (1.4) (+15 -15)
-		doc/users_guide/gimp-edition.sgml (1.2) (+5 -5)
-		doc/users_guide/gimp.sgml (1.3) (+5 -5)
-		doc/users_guide/history.sgml (1.3) (+10 -10)
-		doc/users_guide/title.sgml (1.3) (+8 -8)
-		doc/users_guide/users-guide.sgml (1.8) (+2 -2)
-		doc/users_guide/util-edition.sgml (1.2) (+5 -5)
-		doc/users_guide/utils.sgml (1.6) (+3 -3)
 		include/Makefile.am (1.6) (+3 -3)
 		include/gutenprint/.cvsignore (1.1) ( )
 		include/gutenprint/Makefile.am (1.1) ( )
@@ -2859,12 +3171,6 @@
 
 2004-05-22	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.41) (+13 -13)
-
-	Fix VPATH build.
-
-2004-05-22	<rleigh@sourceforge.net>
-
 	Files:	m4/gimp.m4 (1.5) (+41 -41)
 		m4/stp_gimp.m4 (1.7) (+5 -4)
 
@@ -3568,7 +3874,6 @@
 	Files:	Makefile.am (1.139) (+1 -1)
 		configure.ac (1.97) (+9 -20)
 		doc/developer/Makefile.am (1.13) (+1 -1)
-		doc/users_guide/Makefile.am (1.40) (+1 -1)
 		m4/stp_option.m4 (1.4) (+42 -0)
 		scripts/autogen.sh (1.30) (+1 -0)
 		src/cups/cups-genppdconfig.in (1.8) (+1 -1)
@@ -3858,14 +4163,6 @@
 
 2004-02-27	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.39) (+28 -22)
-
-	Don't distribute the Postscript user's guide and .eps files (saves
-	about 500K in the bz2ball).  Also don't distribute two copies of the
-	.pnd files (saves another 200K or so).
-
-2004-02-27	<rlk@sourceforge.net>
-
 	Files:	Makefile.am (1.137) (+12 -3)
 
 	Don't rebuild the change log if it isn't needed
@@ -4034,12 +4331,6 @@
 	Rename stpi_dither_matrix_iterated_init() argument name "exp" to "exponent"
 	to quell compiler warnings.
 
-2004-01-21	<rleigh@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.38) (+12 -12)
-
-	Fix install error when using the provided install-sh.
-
 2004-01-11	<rlk@sourceforge.net>
 
 	Files:	po/cs.po (1.17) (+17 -17)
@@ -4333,7 +4624,6 @@
 2003-12-02	<rlk@sourceforge.net>
 
 	Files:	NEWS (1.142) (+1 -1)
-		doc/users_guide/gimp.sgml (1.2) (+0 -12)
 		po/cs.po (1.15) (+87 -272)
 		po/da.po (1.43) (+86 -80)
 		po/de.po (1.29) (+87 -265)
@@ -4418,8 +4708,6 @@
 
 	Files:	Makefile.am (1.136) (+2 -2)
 		README (1.131) (+1 -1)
-		doc/users_guide/cups.sgml (1.3) (+2 -2)
-		doc/users_guide/history.sgml (1.2) (+1 -1)
 		m4/stp.m4 (1.5) (+3 -3)
 		m4/stp_cups.m4 (1.8) (+1 -1)
 		m4/stp_gimp.m4 (1.4) (+1 -1)
@@ -9938,7 +10226,6 @@
 2003-01-06	<rleigh@sourceforge.net>
 
 	Files:	doc/developer/Makefile.am (1.8) (+3 -2)
-		doc/users_guide/Makefile.am (1.37) (+4 -2)
 
 	EPSLEVEL may be used to specify the EPS level to use
 
@@ -10131,7 +10418,6 @@
 		configure.ac (1.38) (+52 -41)
 		doc/Makefile.am (1.32) (+2 -0)
 		doc/developer/Makefile.am (1.7) (+3 -1)
-		doc/users_guide/Makefile.am (1.36) (+3 -1)
 		include/Makefile.am (1.3) (+3 -1)
 		m4/stp.m4 (1.4) (+0 -21)
 		m4/stp_cups.m4 (1.6) (+0 -1)
@@ -12243,13 +12529,6 @@
 
 2002-06-30	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.35) (+14 -9)
-
-	Distribute the cups-edition.sgml, gimp-edition.sgml, and
-	util-edition.sgml files.
-
-2002-06-30	<rlk@sourceforge.net>
-
 	Files:	src/main/print-escp2-data.c (1.35) (+43 -337)
 
 	Improve readability
@@ -12777,28 +13056,6 @@
 
 	Use AC_LIBOBJ instead of the deprecated direct LIBOJBS usage
 
-2002-04-08	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/utils.sgml (1.5) (+1 -1)
-
-
-
-	Changed kernel config option from CONFIG_PRINTER_READBACK to CONFIG_PARPORT_1284.
-
-2002-04-08	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.34) (+256 -9)
-		doc/users_guide/cups-edition.sgml (1.1) ( )
-		doc/users_guide/cups.sgml (1.2) (+6 -2)
-		doc/users_guide/gimp-edition.sgml (1.1) ( )
-		doc/users_guide/title.sgml (1.2) (+0 -16)
-		doc/users_guide/users-guide.sgml (1.7) (+18 -0)
-		doc/users_guide/util-edition.sgml (1.1) ( )
-
-
-
-	Created new top level files for separate editions of the User's Guide.
-
 2002-04-08	<davehill@sourceforge.net>
 
 	Files:	src/main/print-pcl.c (1.52) (+2 -2)
@@ -12820,47 +13077,6 @@
 
 	Added descriptions for -o, -s, -l, -M options.  Updated description for -u option.
 
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/utils.sgml (1.3) (+9 -5)
-		doc/users_guide/utils.sgml (1.4) (+6 -12)
-
-	*** empty log message ***
-
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/utils.sgml (1.2) (+57 -51)
-
-
-
-	Reformatting of the escputil examples.  I thought they looked ugly on the
-	right margin when printed.
-
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.33) (+6 -6)
-		doc/users_guide/cups.sgml (1.1) ( )
-		doc/users_guide/gimp.sgml (1.1) ( )
-		doc/users_guide/history.sgml (1.1) ( )
-		doc/users_guide/title.sgml (1.1) ( )
-		doc/users_guide/users-guide.sgml (1.6) (+10 -10)
-		doc/users_guide/utils.sgml (1.1) ( )
-
-
-
-	Renamed files to make it easier to deal with multiple versions
-	of the manual.  Fixed (I think) the make dist problem in Makefile.am.
-	Updated users-guide.sgml to use new file names for chapter files.
-
-2002-04-07	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.32) (+2 -2)
-
-
-
-	Updates include minor textual fixes to ch_0 and ch_4.  Makefile.am repaired to
-	allow make dist to include more than users-guide.sgml.
-
 2002-04-06	<rleigh@sourceforge.net>
 
 	Files:	src/foomatic/Makefile.am (1.23) (+11 -13)
@@ -12887,18 +13103,6 @@
 
 	Let Foomatic data for GhostScript and IJS drivers go into separate directories (to simplify Debian packaging).
 
-2002-04-06	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.31) (+21 -6)
-		doc/users_guide/gfdl.sgml (1.1) ( )
-		doc/users_guide/users-guide.sgml (1.5) (+15 -1869)
-
-
-
-	Added chapter 4, the description of the escputil utility.  Chapters now
-	have their own separate files and the entire document is pulled together
-	via the users-guide.sgml file.  This necessitated a few Makefile changes.
-
 2002-04-06	<rlk@sourceforge.net>
 
 	Files:	m4/.cvsignore (1.1) ( )
@@ -13084,7 +13288,6 @@
 	Files:	Makefile.am (1.127) (+9 -20)
 		doc/Makefile.am (1.31) (+6 -6)
 		doc/developer/Makefile.am (1.6) (+6 -5)
-		doc/users_guide/Makefile.am (1.30) (+4 -2)
 		man/Makefile.am (1.7) (+16 -2)
 		samples/Makefile.am (1.4) (+6 -6)
 		src/Makefile.am (1.12) (+2 -3)
@@ -13412,12 +13615,6 @@
 
 2002-01-26	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.29) (+3 -3)
-
-	Fix manual.sgml dependencies to use $(srcdir) to create correct symlinks
-
-2002-01-26	<rleigh@sourceforge.net>
-
 	Files:	Makefile.am (1.124) (+1 -5)
 		doc/Makefile.am (1.30) (+2 -2)
 		doc/README.maintaining (1.10) (+1 -1)
@@ -13734,14 +13931,6 @@
 
 	Set release date.
 
-2001-11-23	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/figures/cups_admin_model.png (1.2) (+49 -62)
-		doc/users_guide/figures/cups_my_printer.png (1.2) (+33 -68)
-		doc/users_guide/users-guide.sgml (1.4) (+96 -91)
-
-	Updates for rev 4.2.0 release
-
 2001-11-23	<rlk@sourceforge.net>
 
 	Files:	Makefile.am (1.120) (+3 -1)
@@ -13757,12 +13946,6 @@
 
 2001-11-22	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/users-guide.sgml (1.3) (+46 -9)
-
-	Insert warning for connecting USB printers with CUPS.
-
-2001-11-22	<rlk@sourceforge.net>
-
 	Files:	NEWS (1.66) (+2 -5)
 		src/foomatic/foomatic-printermap (1.23) (+0 -3)
 		src/main/printers.xml (1.42) (+1 -31)
@@ -13904,12 +14087,6 @@
 
 2001-11-10	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/users-guide.sgml (1.2) (+1 -1)
-
-	Update release date
-
-2001-11-10	<rlk@sourceforge.net>
-
 	Files:	src/escputil/Makefile.am (1.10) (+2 -2)
 		src/foomatic/Makefile.am (1.15) (+2 -2)
 		test/Makefile.am (1.30) (+2 -2)
@@ -13954,7 +14131,6 @@
 2001-11-08	<rlk@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.27) (+10 -10)
-		doc/users_guide/Makefile.am (1.28) (+11 -11)
 
 	Clean up rm use (many places need either -rm file or rm -f file):
 
@@ -14148,20 +14324,6 @@
 
 2001-10-30	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.27) (+2 -2)
-
-	Minor typo, to fix VPATH build
-
-2001-10-30	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/.cvsignore (1.4) (+8 -8)
-		doc/users_guide/Makefile.am (1.26) (+6 -6)
-		doc/users_guide/users-guide.sgml (1.1) ( )
-
-	Removed underscores from linkend, ids, and filename per Eric
-
-2001-10-30	<rlk@sourceforge.net>
-
 	Files:	src/main/printers.xml (1.37) (+7 -7)
 
 	Tweak C70/80 a bit more
@@ -14197,7 +14359,6 @@
 2001-10-28	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.26) (+36 -12)
-		doc/users_guide/Makefile.am (1.25) (+50 -15)
 
 	Fix VPATH build.  Don't build gimpprint.pdf by default.
 
@@ -14246,8 +14407,6 @@
 		doc/FAQ.html (1.7) (+3 -3)
 		doc/Makefile.am (1.24) (+2 -2)
 		doc/README.maintaining (1.8) (+16 -16)
-		doc/users_guide/README (1.6) (+9 -10)
-		doc/users_guide/figures/README (1.3) (+1 -1)
 		scripts/autogen.sh (1.14) (+2 -2)
 		src/cups/command.txt (1.2) (+1 -1)
 		src/cups/genppd.c (1.31) (+5 -5)
@@ -14421,12 +14580,6 @@
 
 2001-10-19	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.24) (+4 -3)
-
-	Remove incorrect html-stamp usage
-
-2001-10-19	<rleigh@sourceforge.net>
-
 	Files:	test/Makefile.am (1.29) (+2 -2)
 
 	Disable run-weavetest dependency which breaks make dist
@@ -14537,7 +14690,6 @@
 2001-10-16	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.20) (+31 -30)
-		doc/users_guide/Makefile.am (1.23) (+26 -13)
 
 	Make clean works fully in maintainer mode
 	VPATH builds create symlinks to docs correctly
@@ -14664,13 +14816,6 @@
 
 	Translate papersize (text) names before returning them to the user.
 
-2001-10-13	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.22) (+7 -7)
-		doc/users_guide/README (1.5) (+3 -8)
-
-	Fixed spacing...updated README
-
 2001-10-13	<rleigh@sourceforge.net>
 
 	Files:	Makefile.am (1.116) (+10 -10)
@@ -14681,32 +14826,9 @@
 	Use more portable $(RM) instead of 'rm -f'
 	Add reference to SGML users guide to Texinfo manual
 
-2001-10-13	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.21) (+21 -19)
-
-	Clean should not remove the pdf or ps version of the manual, to be
-	consistent with how it treats the html manual.  It also can't remove
-	the .eps files, unfortunately.
-
-	New veryclean target does remove all of the above.
-
-	Distribute the html timestamp to inhibit rebuilding in the field.
-
-	Add phony targets.
-
-	Remove unused ps.gz target.
-
-2001-10-13	<rleigh@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.20) (+14 -8)
-
-	Add DESTDIR support to install-data-local and uninstall-local
-
 2001-10-12	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/.cvsignore (1.3) (+1 -0)
-		src/ghost/.cvsignore (1.6) (+1 -0)
+	Files:	src/ghost/.cvsignore (1.6) (+1 -0)
 
 	Updates
 
@@ -14731,25 +14853,6 @@
 	sizes exceeds 94 in the DesignJet 750 PPD file CUPS loses
 	track of all printers in the administrative interface.
 
-2001-10-11	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/.cvsignore (1.2) (+1 -0)
-
-	Ignore html directory
-
-2001-10-11	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.19) (+11 -31)
-
-	Eliminate dependency on specific Linux (much less UNIX) distribution.
-	Preprocess source rather than intermediate file.
-
-2001-10-11	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.18) (+21 -16)
-
-	PDF users guide builds independently of PS docs.  Also, XREF and IMAGEDATA errors are gone.
-
 2001-10-10	<rlk@sourceforge.net>
 
 	Files:	src/gimp/Makefile.am (1.18) (+4 -5)
@@ -14786,24 +14889,12 @@
 
 2001-10-07	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.17) (+2 -2)
-
-	Need to remove the doc directory on uninstall.
-
-2001-10-07	<rlk@sourceforge.net>
-
 	Files:	README (1.74) (+6 -6)
 
 	A few very minor updates.
 
 2001-10-07	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.16) (+12 -6)
-
-	Assorted minor cleanup and bug fixing.
-
-2001-10-07	<rlk@sourceforge.net>
-
 	Files:	po/.cvsignore (1.5) (+1 -0)
 
 	Ignore change log
@@ -14835,34 +14926,12 @@
 
 2001-10-06	<andystewart@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.15) (+1 -7)
-
-	Removed creation of figures directory in users_guide pdf and eps targets
-
-2001-10-06	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.14) (+6 -21)
-		doc/users_guide/README (1.4) (+2 -2)
-		scripts/autogen.sh (1.9) (+27 -11)
+	Files:	scripts/autogen.sh (1.9) (+27 -11)
 
 	Tweaked doc/users_guide/Makefile.am and added checks for convert and docbook_4 to scripts/autogen.sh
 
 2001-10-06	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/.cvsignore (1.1) ( )
-		doc/users_guide/Makefile.am (1.13) (+6 -1)
-		doc/users_guide/figures/.cvsignore (1.1) ( )
-
-	Updates
-
-2001-10-06	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.12) (+31 -24)
-
-	Add -without-user-guide.
-
-2001-10-06	<rlk@sourceforge.net>
-
 	Files:	README (1.73) (+49 -39)
 
 	Cleanup
@@ -14893,33 +14962,6 @@
 
 2001-10-06	<rlk@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.11) (+3 -3)
-
-	We do need to distribute the .ps file.  Sigh.
-
-2001-10-06	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.10) (+36 -23)
-
-	* List all of the figures explicitly rather than wildcarding
-
-	* Build and distribute HTML and PDF by default
-
-	* Don't export SGML_CATALOG_FILES (especially not incorrect hardcoded
-	  path)
-
-	* Create make install
-
-	* Fix directory permissions botched by the toolchain
-
-2001-10-06	<rlk@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.9) (+2 -2)
-
-	maintainer-clean should clear the html stamp
-
-2001-10-06	<rlk@sourceforge.net>
-
 	Files:	src/foomatic/foomatic-printermap (1.16) (+3 -0)
 
 	Add BJC-210, 240, and 250.
@@ -14932,15 +14974,8 @@
 
 2001-10-05	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.8) (+8 -2)
-
-	Distribute the PDF manual
-
-2001-10-05	<rleigh@sourceforge.net>
-
 	Files:	Makefile.am (1.114) (+9 -1)
 		doc/Makefile.am (1.18) (+25 -4)
-		doc/users_guide/Makefile.am (1.7) (+87 -44)
 
 	Add new make targets: pdf and docs
 	Distribute user_guide html manual by default
@@ -14955,27 +14990,6 @@
 	Allow softweave printing on first generation printers that should
 	support it.
 
-2001-10-04	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.6) (+2 -3)
-
-	Removing Makefile as it is now built by automake
-
-2001-10-04	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.5) (+3 -3)
-		doc/users_guide/README (1.3) (+8 -0)
-
-	*** empty log message ***
-
-2001-10-04	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/Makefile.am (1.4) (+13 -28)
-		doc/users_guide/README (1.2) (+12 -14)
-		doc/users_guide/figures/README (1.2) (+5 -7)
-
-	Updates to Makefile.am, READMEs, and rename orig source file to remove rev
-
 2001-10-03	<rlk@sourceforge.net>
 
 	Files:	src/foomatic/foomatic-generator.in (1.13) (+1 -1)
@@ -14986,14 +15000,12 @@
 
 	Files:	Makefile.am (1.113) (+6 -6)
 		doc/Makefile.am (1.17) (+4 -4)
-		doc/users_guide/Makefile.am (1.3) (+4 -4)
 
 	Correct program naming, use variables for perl invocation
 
 2001-10-03	<rleigh@sourceforge.net>
 
 	Files:	doc/Makefile.am (1.16) (+3 -1)
-		doc/users_guide/Makefile.am (1.2) (+54 -13)
 
 	Add users_guide to doc/Makefile.am SUBDIRS
 	Automatically generate EPS and PDF images from PNG source
@@ -15008,39 +15020,10 @@
 
 2001-10-02	<rleigh@sourceforge.net>
 
-	Files:	doc/users_guide/Makefile.am (1.1) ( )
-
-	Add preliminary support for the new SGML user guide
-
-2001-10-02	<rleigh@sourceforge.net>
-
 	Files:	Makefile.am (1.112) (+10 -1)
 
 	Use standard Makefile formatting
 
-2001-10-02	<andystewart@sourceforge.net>
-
-	Files:	doc/users_guide/README (1.1) ( )
-		doc/users_guide/figures/README (1.1) ( )
-		doc/users_guide/figures/cups_admin.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_device.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_make.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_model.png (1.1) ( )
-		doc/users_guide/figures/cups_admin_success.png (1.1) ( )
-		doc/users_guide/figures/cups_config_printer.png (1.1) ( )
-		doc/users_guide/figures/cups_my_printer.png (1.1) ( )
-		doc/users_guide/figures/cups_printers.png (1.1) ( )
-		doc/users_guide/figures/cups_startup.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-gui-1.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-gui.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-new-printer.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-print-color-adjust.png (1.1) ( )
-		doc/users_guide/figures/gimp-print-setup.png (1.1) ( )
-		doc/users_guide/figures/gimp_image.png (1.1) ( )
-		doc/users_guide/figures/gimp_startup.png (1.1) ( )
-
-	Initial checkin of user's guide
-
 2001-10-02	<rlk@sourceforge.net>
 
 	Files:	src/escputil/escputil.c (1.31) (+2 -1)
diff --git a/INSTALL b/INSTALL
index 56b077d..23e5f25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -102,16 +102,16 @@ for another architecture.
 Installation Names
 ==================
 
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +159,7 @@ where SYSTEM can have one of these forms:
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
diff --git a/Makefile.am b/Makefile.am
index e941950..72cd6c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.143 2005/07/01 22:48:27 rleigh Exp $
+## $Id: Makefile.am,v 1.144 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000-2004 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -18,11 +18,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.5 dist-bzip2 check-news gnu no-dependencies
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
 ACLOCAL_AMFLAGS = -I m4 -I m4local
 
 include $(top_srcdir)/scripts/global.mk
diff --git a/Makefile.in b/Makefile.in
index b818029..2ce07a2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -78,14 +78,12 @@ am__remove_distdir = \
   { test ! -d $(distdir) \
     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
          && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -123,7 +121,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -136,14 +133,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -278,13 +273,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -330,8 +320,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.5 dist-bzip2 check-news gnu no-dependencies
-MAINT_CHARSET = latin1
 ACLOCAL_AMFLAGS = -I m4 -I m4local
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 SUBDIRS = include src samples test po man doc scripts
@@ -402,15 +390,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu  --ignore-deps'; \
+	      cd $(srcdir) && $(AUTOMAKE) --gnu  --ignore-deps \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -671,7 +659,6 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
diff --git a/NEWS b/NEWS
index 769d398..7605798 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Welcome to Gutenprint 5.0.0-rc1!  Please read these release notes
+Welcome to Gutenprint 5.0.0-rc2!  Please read these release notes
 carefully.
 
 Gutenprint, formerly named Gimp-Print, is a suite of printer drivers
@@ -75,7 +75,7 @@ on building and installing Gutenprint.
 
 These release notes contain the following sections:
 
-1) Changes from 5.0.0-beta4 to 5.0.0-rc1
+1) Changes from 5.0.0-rc1 to 5.0.0-rc2
 2) Overall changes from 4.2 to 5.0.
 3) Known build/installation issues
 4) List of supported printers
@@ -83,148 +83,79 @@ These release notes contain the following sections:
 
 ================================================================
 
-* Major changes between Gutenprint 5.0.0 beta 4 and Gutenprint 5.0.0
-  release candidate 1:
-
-  1) Color correction is greatly improved, particularly for Epson
-     printers.  The following general and specific improvements have
-     been made:
-
-     * The default gamma for all Epson printers has been increased to
-       resolve long-standing issues with overly dark prints.  The user
-       gamma adjustment is specified as a correction, so the default
-       value of 1.0 will yield correct results.
-
-     * Luminosity (darkness) correction has been simplified and
-       improved by performing correction only on the color component,
-       without adjusting the gray component.  This improves dark cyans
-       and greens in particular, and generally yields smoother tonal
-       changes.
-
-     * Red and blue generation for the Epson Stylus R800 and R1800
-       (and for any future printers) has been completely revamped.  It
-       is now done by using per-channel curves.  This improves control
-       over the output and allows ink combinations that could not be
-       generated with the previous code.  The most notable effect is
-       improved magenta.
-
-     * Greens have been improved on all Epson printers and are now
-       considerably more saturated and less yellow.
-
-     * Black generation has been improved on all printers,
-       particularly Epson printers using Ultrachrome (R) inks.
-
-     * Photo (light cyan and light magenta) ink generation has been
-       improved on many Epson printers.
-
-     * Composite gray generation is now done by adding in CMY inks
-       rather than subtracting out the gray component.  This separates
-       the gray balance from the per-channel ink density, permitting
-       much better color saturation for certain printers with
-       unbalanced inks.  In particular, the Epson R-series printers
-       can now generate much better orange, yellow, and green without
-       sacrificing neutrality of grayscale.
-
-     * The operation of the Bright Colors color correction mode has
-       been changed, and is now much closer to the operation of High
-       Accuracy.  The main difference is that highly saturated colors
-       now clip rather than taper off toward full saturation.  This
-       will yield improved color brilliance with some loss of detail
-       in certain cases (particularly bright greens).
-
-     * A new Correct Hue Only mode has been added that corrects ink
-       hue without adjusting darkness.  This permits achieving greater
-       color saturation without losing hue accuracy, although many
-       colors will be too dark in this mode.
-
-  2) PrintoutMode has been fixed in the Foomatic data generator so
-     that it now generates correct options in all cases.
-
-  3) CUPS PPD files are now built with translations enabled.  If you
-     do not want translated PPD files, configure the package with
-
-     ./configure --disable-translated-cups-ppds
-
-  4) The Canon SELPHY CP-600 dye sublimation printer has been added.
-
-  5) Preliminary support for the Canon Pixma i4000 printer has been
-     added.  The Canon BubbleJet and Pixma driver is likely to undergo
-     considerable revision and may not be fully stabilized at release.
-
-  6) The Epson Stylus C82, C84, and C86 now use black ink with glossy
-     paper.  The ink in these printers has been reformulated and is
-     now compatible with glossy paper.
-
-  7) The Epson Stylus CX3650 now prints correctly (previously there
-     were minor vertical offset problems, yielding slightly blurry
-     prints).
-
-  8) The Ghostscript driver (ijsgutenprint) now generates correct
-     output (previously it generated output that was much too dark
-     unless the gamma setting was enabled explicitly).
-
-  9) New printing resolutions have been added for certain Epson
-     printers:
-
-     * 720 DPI high quality has been added for all but the very oldest
-       Epson printers, and 1440x720 DPI highest quality has been added
-       for all Epson printers with an upper resolution limit of
-       2880x720 DPI.  We have received reports that 1440x720 highest
-       quality, which was present in Gimp-Print 4.2, often produces
-       better output than 2880x720 while requiring less computation.
-
-     * 2880x2880 DPI resolution has been added for the Epson Stylus
-       C86 and similar printers, such as the CX6600.  While this is
-       not likely to yield a great improvement over 2880x1440 DPI,
-       this may yield some improvement for certain kinds of line art
-       with very fine detail.  In general, there is little advantage
-       to be had from any resolution above 1440x1440 DPI with this
-       printer.
-
-     * 5760x2880 DPI has been added for the Epson Stylus Photo R800
-       and R1800.  Tests indicate that this resolution does offer a
-       small degree of improvement over 2880x2880; the most noticeable
-       improvement is smoother tonality.  This enhancement may be
-       desirable for particularly critical printing.
-
-  10) The Epson Stylus RX425 is now explicitly supported.
-
-  11) Some problems with PPD file generation using cups-genppdconfig
-     have been fixed.  In particular, PPD permission and ownership
-     checks have been relaxed to permit operation on more systems.
-
-  12) A problem that could on rare occasions cause blank areas on photo
-     printers has been fixed.  The problem was more likely to be
-     observed when printing in 16-bit mode.
-
-  13) Debian packaging has been removed from this release.  Debian
-     packaging will be handled by the maintainer outside of the
-     release.
+* Major changes between Gutenprint 5.0.0 release candidate 1 and
+  Gutenprint 5.0.0 release candidate 2:
 
-  14) On systems supporting shared library versioning, the shared
-     library is labeled with the correct release version rather than a
-     development version.
+  1) The Postscript driver now produces more accurate colors.
+     Previous releases produced overly pale colors with the default
+     settings.
 
-  15) It is now possible to specify variable drop sizes with
-     predithered mode.  Values of 0, 1, 2, or 3 will cause the
-     appropriate drop size to be printed.  Previously only the
-     smallest or largest drop size could be printed with this dither
-     mode.
+  2) The Postscript driver now accepts red, green, and blue rather
+     than cyan, magenta, and yellow options in the GIMP plugin.
 
-  16) Traditional Chinese (zh_TW) translation has been added.
+  3) The Postscript driver now prints correctly regardless of image
+     size.  Previously it corrupted the output if the width of the
+     image was not a multiple of 4 pixels.
 
-  17) A problem whereby attempting to use certain paper types with
-     certain Epson printers would cause a failure is fixed.
-
-  18) A problem whereby the image height and width were not properly
-     preserved across uses of the GIMP plugin is fixed.
-
-  19) In the Foomatic data the options "STP_InputSlot" and
-     "STP_MediaType" were renamed to "InputSlot" and "MediaType". This
-     way the names are Adobe-compliant and so PPD-aware applications
-     understand for what they are used for and treat them
-     appropriately (for example appear on first page of printer
-     options dialog of kprinter and XPP).
+  4) The GIMP plugin now loads the printrc file correctly in all
+     locales.  Previously it did not load floating point numbers
+     correctly in locales that don't use the `.' character as the
+     decimal point.
+
+  5) The GIMP plugin now offers improved choices in the color
+     adjustment window for viewing individual channels of the output.
+     It now offers red/green/blue, cyan/magenta/yellow, or
+     cyan/magenta/yellow/black as appropriate.
+
+  6) The GIMP plugin is now considerably more responsive; many
+     unnecessary screen redraws have been removed.
+
+  7) The Epson printer utility escputil now reports ink information
+     more consistently across a wider range of printers.  In
+     particular, the extended ink information command (escputil -e)
+     should now work correctly on all models from the Stylus Color 740
+     through the present.
+
+  8) Preliminary support for the Epson Stylus C68, C87, C88, CX3700,
+     CX3800, CX3810, CX4200, CX4700, CX4800, CX5800, CX7700, CX7800,
+     D68, D88, DX3800, DX3850, DX4200, DX4800, and Stylus Photo R220,
+     R320, and R340.  These printers are expected to be fully
+     functional (for the multi-function devices, this package supports
+     only the printer function).
+
+  9) Preliminary support for the Epson Stylus Photo R2400.  This
+     printer has been partially tuned, but there will likely be
+     further changes to this driver.
+
+  10) Experimental support for the Epson Stylus Photo RX700.  This
+     printer may or may not function correctly, and is not likely to
+     be properly tuned.
+
+  11) Initial support for Canon S200, SELPHY CP-510 and SELPHY CP-710;
+     Sony UP-DR150, and Olympus P-11 has been added.
+
+  12) The Canon PIXMA iP4000 printers can now print to cds.  Duplex
+     printing with binding on the short side is now supported, too.
+
+  13) The Epson Stylus Photo R200 and related printers have been
+     retuned to give improved detail in the shadows, reduced ink
+     usage, more accurate grayscale, and more accurate colors.
+     Affected printers are the R200, R210, R220, R300, R310, R320,
+     R340, RX400, RX420, RX425, RX430, RX500, RX510, RX600, RX620,
+     RX630, PM-D750, PM-D770, PM-G700, and, PM-G720.
+
+     Any profiles generated against these printers will have to be
+     re-created.
+
+  14) New "transposed" resolutions (1440x720 and 2880x1440) have been
+     added for some Epson printers.  These resolutions are actually
+     equivalent to 720x1440 and 1440x2880 DPI respectively.  In some
+     cases these may yield better results (specifically, less
+     microbanding) than the normal 1440x720 and 2880x1440 DPI
+     resolutions.
+
+  15) Quadtone printing now works correctly regardless of whether
+     color or grayscale mode is selected.
 
 
 ================================================================
@@ -1373,6 +1304,7 @@ Canon BJC 7100
 Canon BJC 8200
 Canon CP-100 series
 Canon CP-220 series
+Canon S200            (Experimental)
 Canon S400
 Canon S450
 Canon S800
@@ -1392,6 +1324,7 @@ EPSON Stylus C44SX
 EPSON Stylus C44UX
 EPSON Stylus C45
 EPSON Stylus C46
+EPSON Stylus C48
 EPSON Stylus C50
 EPSON Stylus C60
 EPSON Stylus C61
@@ -1400,6 +1333,7 @@ EPSON Stylus C63
 EPSON Stylus C64
 EPSON Stylus C65
 EPSON Stylus C66
+EPSON Stylus C68
 EPSON Stylus C70
 EPSON Stylus C80
 EPSON Stylus C82
@@ -1407,6 +1341,8 @@ EPSON Stylus C83
 EPSON Stylus C84
 EPSON Stylus C85
 EPSON Stylus C86
+EPSON Stylus C87
+EPSON Stylus C88
 EPSON Stylus Color
 EPSON Stylus Color Pro
 EPSON Stylus Color Pro XL
@@ -1459,8 +1395,11 @@ EPSON Stylus Photo 2100
 EPSON Stylus Photo 2200
 EPSON Stylus Photo R200
 EPSON Stylus Photo R210
+EPSON Stylus Photo R220
 EPSON Stylus Photo R300
 EPSON Stylus Photo R310
+EPSON Stylus Photo R320
+EPSON Stylus Photo R340
 EPSON Stylus Photo RX400
 EPSON Stylus Photo RX420
 EPSON Stylus Photo RX425
@@ -1470,8 +1409,10 @@ EPSON Stylus Photo RX510
 EPSON Stylus Photo RX600
 EPSON Stylus Photo RX620
 EPSON Stylus Photo RX630
+EPSON Stylus Photo RX700 (Experimental)
 EPSON Stylus Photo R800
 EPSON Stylus Photo R1800
+EPSON Stylus Photo R2400 (Experimental)
 EPSON Stylus Pro 5000
 EPSON Stylus Pro 5500
 EPSON Stylus Pro 7000
@@ -1489,17 +1430,32 @@ EPSON Stylus CX-3200
 EPSON Stylus CX-3500
 EPSON Stylus CX-3600
 EPSON Stylus CX-3650
+EPSON Stylus CX-3700
+EPSON Stylus CX-3800
+EPSON Stylus CX-3810
+EPSON Stylus CX-4200
 EPSON Stylus CX-4600
+EPSON Stylus CX-4700
+EPSON Stylus CX-4800
 EPSON Stylus CX-5100
 EPSON Stylus CX-5200
 EPSON Stylus CX-5300
 EPSON Stylus CX-5400
+EPSON Stylus CX-5800
 EPSON Stylus CX-6300
 EPSON Stylus CX-6400
 EPSON Stylus CX-6500
 EPSON Stylus CX-6600
+EPSON Stylus CX-7700
+EPSON Stylus CX-7800
 EPSON Stylus CX-8300
 EPSON Stylus CX-8400
+EPSON Stylus D68
+EPSON Stylus D88
+EPSON Stylus DX-3800
+EPSON Stylus DX-3850
+EPSON Stylus DX-4200
+EPSON Stylus DX-4800
 EPSON CL-700
 EPSON CL-750
 EPSON CL-760    (Experimental)
@@ -1611,12 +1567,13 @@ Lexmark Z42
 Lexmark Z43
 Lexmark Z52
 Lexmark Z53
-Olympus P-10
+Olympus P-10 series
 Olympus P-200
 Olympus P-300 series
 Olympus P-400
 Olympus P-440
 Sony UP-DP10    (Experimental)
+Sony UP-DR150   (Experimental)
 
 The following is the complete list of printers believed to be
 compatible with Gutenprint, along with recommended drivers.  Some of
@@ -1692,7 +1649,9 @@ Canon CP-220                   canon-cp220     Canon CP220
 Canon CP-330                   canon-cp220     Canon CP220
 Canon SELPHY CP-400            canon-cp220     Canon SELPHY CP400
 Canon SELPHY CP-500            canon-cp220     Canon SELPHY CP500
+Canon SELPHY CP-510            canon-cp220     Canon SELPHY CP510
 Canon SELPHY CP-600            canon-cp220     Canon SELPHY CP600
+Canon SELPHY CP-710            canon-cp220     Canon SELPHY CP710
 Canon GP 335                   pcl-4           HP LaserJet 4 series
 Canon LBP-4sx                  pcl-3           HP LaserJet III series
 Canon LBP-430                  pcl-4l          HP LaserJet 4L
@@ -1746,6 +1705,7 @@ Epson Stylus C44SX             escp2-c44sx     EPSON Stylus C44SX
 Epson Stylus C44UX             escp2-c44ux     EPSON Stylus C44UX
 Epson Stylus C45               escp2-c45       EPSON Stylus C45
 Epson Stylus C46               escp2-c46       EPSON Stylus C46
+Epson Stylus C48               escp2-c48       EPSON Stylus C48
 Epson Stylus C50               escp2-c50       EPSON Stylus C50
 Epson Stylus C60               escp2-c60       EPSON Stylus C60
 Epson Stylus C61               escp2-c61       EPSON Stylus C61
@@ -1754,6 +1714,7 @@ Epson Stylus C63               escp2-c63       EPSON Stylus C63
 Epson Stylus C64               escp2-c64       EPSON Stylus C64
 Epson Stylus C65               escp2-c65       EPSON Stylus C65
 Epson Stylus C66               escp2-c66       EPSON Stylus C66
+Epson Stylus C68               escp2-c68       EPSON Stylus C68
 Epson Stylus C70               escp2-c70       EPSON Stylus C70
 Epson Stylus C80               escp2-c80       EPSON Stylus C80
 Epson Stylus C82               escp2-c82       EPSON Stylus C82
@@ -1761,6 +1722,7 @@ Epson Stylus C83               escp2-c83       EPSON Stylus C83
 Epson Stylus C84               escp2-c84       EPSON Stylus C84
 Epson Stylus C85               escp2-c85       EPSON Stylus C85
 Epson Stylus C86               escp2-c86       EPSON Stylus C86
+Epson Stylus C88               escp2-c88       EPSON Stylus C88
 Epson Stylus Color             escp2           EPSON Stylus Color
 Epson Stylus Color I           escp2           EPSON Stylus Color
 Epson Stylus Color II          escp2           EPSON Stylus Color
@@ -1823,15 +1785,23 @@ Epson Stylus Photo 2200        escp2-2200      EPSON Stylus Photo 2200
 Epson Stylus Photo EX          escp2-ex        EPSON Stylus Photo EX
 Epson Stylus Photo EX3         escp2-ex3       EPSON Stylus Photo EX3
 Epson Stylus Photo R200        escp2-r200      EPSON Stylus Photo R200
+Epson Stylus Photo R210        escp2-r210      EPSON Stylus Photo R210
+Epson Stylus Photo R220        escp2-r220      EPSON Stylus Photo R220
 Epson Stylus Photo R300        escp2-r300      EPSON Stylus Photo R300
+Epson Stylus Photo R310        escp2-r310      EPSON Stylus Photo R310
+Epson Stylus Photo R320        escp2-r320      EPSON Stylus Photo R320
+Epson Stylus Photo R340        escp2-r340      EPSON Stylus Photo R340
 Epson Stylus Photo RX400       escp2-rx400     EPSON Stylus Photo RX400
 Epson Stylus Photo RX420       escp2-rx420     EPSON Stylus Photo RX420
 Epson Stylus Photo RX425       escp2-rx425     EPSON Stylus Photo RX425
 Epson Stylus Photo RX500       escp2-rx500     EPSON Stylus Photo RX500
 Epson Stylus Photo RX600       escp2-rx600     EPSON Stylus Photo RX600
 Epson Stylus Photo RX620       escp2-rx620     EPSON Stylus Photo RX620
+Epson Stylus Photo RX630       escp2-rx630     EPSON Stylus Photo RX630
+Epson Stylus Photo RX700       escp2-rx700     EPSON Stylus Photo RX700
 Epson Stylus Photo R800        escp2-r800      EPSON Stylus Photo R800
 Epson Stylus Photo R1800       escp2-r1800     EPSON Stylus Photo R1800
+Epson Stylus Photo R2400       escp2-r2400     EPSON Stylus Photo R2400
 Epson Stylus Pro 5000          escp2-5000      EPSON Stylus Pro 5000
 Epson Stylus Pro 5500          escp2-5500      EPSON Stylus Pro 5500
 Epson Stylus Pro 7000          escp2-7000      EPSON Stylus Pro 7000
@@ -1848,16 +1818,30 @@ Epson Stylus CX3200            escp2-cx3200    EPSON Stylus CX-3200
 Epson Stylus CX3500            escp2-cx3500    EPSON Stylus CX-3500
 Epson Stylus CX3600            escp2-cx3600    EPSON Stylus CX-3600
 Epson Stylus CX3650            escp2-cx3650    EPSON Stylus CX-3650
+Epson Stylus CX3700            escp2-cx3700    EPSON Stylus CX-3700
+Epson Stylus CX3800            escp2-cx3800    EPSON Stylus CX-3800
+Epson Stylus CX4200            escp2-cx4200    EPSON Stylus CX-4200
 Epson Stylus CX4600            escp2-cx4600    EPSON Stylus CX-4600
+Epson Stylus CX4700            escp2-cx4700    EPSON Stylus CX-4700
+Epson Stylus CX4800            escp2-cx4800    EPSON Stylus CX-4800
 Epson Stylus CX5100            escp2-cx5100    EPSON Stylus CX-5100
 Epson Stylus CX5200            escp2-cx5200    EPSON Stylus CX-5200
 Epson Stylus CX5300            escp2-cx5300    EPSON Stylus CX-5300
 Epson Stylus CX5400            escp2-cx5400    EPSON Stylus CX-5400
+Epson Stylus CX5800            escp2-cx5800    EPSON Stylus CX-5800
 Epson Stylus CX6300            escp2-cx6300    EPSON Stylus CX-6300
 Epson Stylus CX6400            escp2-cx6400    EPSON Stylus CX-6400
 Epson Stylus CX6600            escp2-cx6600    EPSON Stylus CX-6600
+Epson Stylus CX7700            escp2-cx7700    EPSON Stylus CX-7700
+Epson Stylus CX7800            escp2-cx7800    EPSON Stylus CX-7800
 Epson Stylus CX8300            escp2-cx8300    EPSON Stylus CX-8300
 Epson Stylus CX8400            escp2-cx8400    EPSON Stylus CX-8400
+Epson Stylus D68               escp2-d68       EPSON Stylus D68
+Epson Stylus D88               escp2-d88       EPSON Stylus D88
+Epson Stylus DX3800            escp2-dx3800    EPSON Stylus DX-3800
+Epson Stylus DX3850            escp2-dx3850    EPSON Stylus DX-3850
+Epson Stylus DX4200            escp2-dx4200    EPSON Stylus DX-4200
+Epson Stylus DX4800            escp2-dx4800    EPSON Stylus DX-4800
 Epson CL-700                   escp2-cl700     EPSON CL-700
 Epson CL-750                   escp2-cl750     EPSON CL-750
 Epson CL-760                   escp2-cl760     EPSON CL-760
@@ -2259,6 +2243,7 @@ Okidata Super 6e               pcl-4l          HP LaserJet 4L
 Olivetti JP350S                pcl-2           HP LaserJet II series
 Olivetti PG 306                pcl-2           HP LaserJet II series
 Olympus P-10                   olympus-p10     Olympus P10 
+Olympus P-11                   olympus-p10     Olympus P11 
 Olympus P-200                  olympus-p200    Olympus P200
 Olympus P-300E                 olympus-p300    Olympus P300
 Olympus P-300U                 olympus-p300    Olympus P300
@@ -2290,6 +2275,7 @@ Seiko SpeedJET 200             pcl-2           HP LaserJet II series
 Sharp AR-161                   pcl-6           HP LaserJet 6 series
 Sony IJP-V100                  pcl-601         HP DeskJet 600 series
 Sony UP-DP10                   sony-updp10     Sony UP-DP10
+Sony UP-DR150                  sony-updr150    Sony UP-DR150
 Star LS-04                     pcl-2           HP LaserJet II series
 Star LaserPrinter 8            pcl-2           HP LaserJet II series
 Tally MT908                    pcl-3           HP LaserJet III series
@@ -2312,30 +2298,13 @@ Generic PCL 6/PCL XL Printer   pcl-6           HP LaserJet 6 series
 Printer-Specific Notes:
 
     * It is strongly recommended that four color mode not be used on
-      the Epson Stylus C63, C64, C65, C66, C70, C80, C82, C83, C84,
-      C85, C86, and CX-5200, and the PX-V500 and PX-V600 when printing
-      to glossy papers, as the black ink is formulated differently
-      from the color ink and does not adhere properly to these papers.
-      Epson Photo Paper, Premium Glossy Photo Paper, Premium Luster
-      Photo Paper, and Premium Semigloss Photo Paper are known to be
-      affected.  If you use the Standard ink type, this will be
-      handled automatically.
-
-    * The Epson Stylus C70, C80, and C82 appear to support resolutions
-      of 1440x1440 and 2880x1440, but these resolutions may not yield
-      any improvement over 2880x720 or even 1440x720 DPI.  Due to
-      improvements in the driver, these extremely high resolutions
-      will offer very little if any improvement when printing
-      photographs or other continuous-tone images.  For printing line
-      art with extremely fine detail these resolutions may offer some
-      improvement due to the nature of the printed image.  We expect
-      that 1440x1440 would yield maximum improvement over 2880x720 on
-      line art with very fine detail.  It is unlikely that 2880x1440
-      would yield any significant additional improvement.
-
-      Note that these resolutions are not officially supported by
-      Epson on the C70 and C80, and may not work on all C70 and C80
-      printers.
+      the Epson Stylus C63, C64, C65, C66, C70, C80, and CX-5200, and
+      the PX-V500 and PX-V600 when printing to glossy papers, as the
+      black ink is formulated differently from the color ink and does
+      not adhere properly to these papers.  Epson Photo Paper, Premium
+      Glossy Photo Paper, Premium Luster Photo Paper, and Premium
+      Semigloss Photo Paper are known to be affected.  If you use the
+      Standard ink type, this will be handled automatically.
 
     * The Gutenprint driver does not in all cases offer the same set
       of resolutions offered by the printer manufacturer's drivers.
diff --git a/aclocal.m4 b/aclocal.m4
index a0885cc..111d141 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005  Free Software Foundation, Inc.
@@ -18,7 +18,7 @@ dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MO
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN([AM_PATH_GLIB],
+AC_DEFUN(AM_PATH_GLIB,
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl
@@ -405,7 +405,7 @@ main ()
 
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 
-# serial 47 AC_PROG_LIBTOOL
+# serial 47 Debian 1.5.20-2 AC_PROG_LIBTOOL
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -515,7 +515,7 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -535,7 +535,7 @@ rm="rm -f"
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -583,6 +583,8 @@ if test -n "$RANLIB"; then
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+_LT_CC_BASENAME([$compiler])
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -628,6 +630,48 @@ compiler=$CC
 ])# _LT_AC_SYS_COMPILER
 
 
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+AC_DEFUN([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+  case $cc_temp in
+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+AC_DEFUN([_LT_LINKER_BOILERPLATE],
+[ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+])# _LT_LINKER_BOILERPLATE
+
+
 # _LT_AC_SYS_LIBPATH_AIX
 # ----------------------
 # Links a minimal program and checks the executable
@@ -700,15 +744,15 @@ fi
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -877,7 +921,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -959,7 +1003,7 @@ AC_CACHE_CHECK([$1], [$2],
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -969,8 +1013,10 @@ AC_CACHE_CHECK([$1], [$2],
    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
      fi
    fi
@@ -996,11 +1042,16 @@ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
    LDFLAGS="$LDFLAGS $3"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
+     # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
+       $SED '/^$/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
      else
        $2=yes
      fi
@@ -1024,7 +1075,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
 AC_MSG_CHECKING([the maximum length of command line arguments])
 AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
   i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -1059,20 +1110,47 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # Add a significant safety factor because C++ compilers can tack on massive
     # amounts of additional arguments before passing them to the linker.
     # It appears as though 1/2 is a usable value.
@@ -1168,7 +1246,7 @@ int main ()
 }]
 EOF
   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) $1 ;;
@@ -1317,7 +1395,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
@@ -1329,11 +1407,13 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -1397,8 +1477,8 @@ AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
 _LT_AC_TAGVAR(hardcode_action, $1)=
 if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -1468,7 +1548,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -1565,7 +1645,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -1581,7 +1661,7 @@ bsdi4*)
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -1593,7 +1673,8 @@ cygwin* | mingw* | pw32*)
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -1623,7 +1704,7 @@ cygwin* | mingw* | pw32*)
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -1646,7 +1727,7 @@ darwin* | rhapsody*)
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -1681,8 +1762,17 @@ kfreebsd*-gnu)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[123]]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -1700,7 +1790,7 @@ freebsd*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -1727,9 +1817,9 @@ hpux9* | hpux10* | hpux11*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -1744,7 +1834,7 @@ hpux9* | hpux10* | hpux11*)
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -1755,7 +1845,7 @@ hpux9* | hpux10* | hpux11*)
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -1826,8 +1916,8 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -1839,6 +1929,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -1889,7 +1991,11 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -1909,7 +2015,7 @@ openbsd*)
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -2055,7 +2161,9 @@ if test -f "$ltmain" && test -n "$tagnames"; then
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  AC_LIBTOOL_LANG_CXX_CONFIG
 	else
 	  tagname=""
@@ -2117,7 +2225,7 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN],
 
 # AC_LIBTOOL_WIN32_DLL
 # --------------------
-# declare package support for building win32 dll's
+# declare package support for building win32 DLLs
 AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 ])# AC_LIBTOOL_WIN32_DLL
@@ -2291,7 +2399,7 @@ dnl not every word.  This closes a longstanding sh security hole.
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -2401,7 +2509,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -2433,7 +2541,7 @@ AC_PROG_LD_GNU
 AC_DEFUN([AC_PROG_LD_GNU],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -2460,6 +2568,15 @@ case $reload_flag in
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 ])# AC_PROG_LD_RELOAD_FLAG
 
 
@@ -2493,21 +2610,21 @@ beos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[[45]]*)
   lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
@@ -2516,13 +2633,13 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -2538,7 +2655,7 @@ gnu*)
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -2566,19 +2683,10 @@ irix5* | irix6* | nonstopux*)
 
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64)
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   else
@@ -2597,12 +2705,10 @@ nto-qnx*)
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
   fi
   ;;
 
@@ -2723,13 +2829,13 @@ esac
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl convenience library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-convenience to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
+# (note the single quotes!).  If your package is not flat and you're not
+# using automake, define top_builddir and top_srcdir appropriately in
+# the Makefiles.
 AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
   case $enable_ltdl_convenience in
@@ -2748,13 +2854,13 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 # -----------------------------------
 # sets LIBLTDL to the link flags for the libltdl installable library and
 # LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
+# --enable-ltdl-install to the configure arguments.  Note that
+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
+# and an installed libltdl is not found, it is assumed to be `libltdl'.
+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
+# '${top_srcdir}/' (note the single quotes!).  If your package is not
+# flat and you're not using automake, define top_builddir and top_srcdir
+# appropriately in the Makefiles.
 # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
 [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
@@ -2792,10 +2898,21 @@ AC_DEFUN([AC_LIBTOOL_CXX],
 # ---------------
 AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 ])# _LT_AC_LANG_CXX
 
+# _LT_AC_PROG_CXXCPP
+# ---------------
+AC_DEFUN([_LT_AC_PROG_CXXCPP],
+[
+AC_REQUIRE([AC_PROG_CXX])
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+fi
+])# _LT_AC_PROG_CXXCPP
 
 # AC_LIBTOOL_F77
 # --------------
@@ -2868,6 +2985,10 @@ lt_simple_link_test_code='int main(){return(0);}\n'
 
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 #
 # Check for any special shared library compilation flags.
 #
@@ -2918,7 +3039,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -2927,47 +3048,10 @@ aix3*)
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
     ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -2993,7 +3077,7 @@ AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
 AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 [AC_LANG_PUSH(C++)
 AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_AC_TAGVAR(allow_undefined_flag, $1)=
@@ -3022,7 +3106,7 @@ _LT_AC_TAGVAR(postdeps, $1)=
 _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -3037,6 +3121,10 @@ lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -3058,7 +3146,7 @@ test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -3165,7 +3253,7 @@ case $host_os in
     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -3186,6 +3274,9 @@ case $host_os in
 	fi
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -3231,7 +3322,7 @@ case $host_os in
 	# Exported symbols can be pulled into shared objects from archives
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
+	# This is similar to how AIX traditionally builds its shared libraries.
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
@@ -3245,6 +3336,7 @@ case $host_os in
     esac
     ;;
 
+
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
@@ -3268,65 +3360,76 @@ case $host_os in
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
+      fi
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3337,14 +3440,14 @@ case $host_os in
 	;;
     esac
     ;;
-  freebsd[12]*)
+  freebsd[[12]]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     _LT_AC_TAGVAR(ld_shlibs, $1)=no
     ;;
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3361,11 +3464,11 @@ case $host_os in
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
-    aCC)
+    aCC*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
@@ -3375,7 +3478,7 @@ case $host_os in
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
@@ -3389,7 +3492,7 @@ case $host_os in
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*)
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -3405,7 +3508,7 @@ case $host_os in
         ;;
       esac
     fi
-    case "$host_cpu" in
+    case $host_cpu in
     hppa*64*)
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -3426,12 +3529,12 @@ case $host_os in
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      aCC)
-	case "$host_cpu" in
+      aCC*)
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
@@ -3452,7 +3555,7 @@ case $host_os in
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    ia64*|hppa*64*)
 	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	      ;;
@@ -3470,9 +3573,9 @@ case $host_os in
     ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -3483,7 +3586,7 @@ case $host_os in
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
 	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
@@ -3496,7 +3599,7 @@ case $host_os in
     ;;
   linux*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -3521,17 +3624,41 @@ case $host_os in
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -3562,7 +3689,7 @@ case $host_os in
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -3572,7 +3699,7 @@ case $host_os in
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -3583,9 +3710,25 @@ case $host_os in
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    ;;
+  openbsd*)
+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -3601,14 +3744,14 @@ case $host_os in
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3626,7 +3769,7 @@ case $host_os in
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3645,7 +3788,7 @@ case $host_os in
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -3660,17 +3803,17 @@ case $host_os in
 	# the KAI C++ compiler.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      cxx)
+      cxx*)
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -3689,7 +3832,7 @@ case $host_os in
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -3713,7 +3856,7 @@ case $host_os in
   sco*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
@@ -3725,12 +3868,12 @@ case $host_os in
     ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3743,36 +3886,33 @@ case $host_os in
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
 	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -3780,7 +3920,7 @@ case $host_os in
 	# in the archive.
 	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
@@ -3823,7 +3963,7 @@ case $host_os in
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3929,7 +4069,7 @@ if AC_TRY_EVAL(ac_compile); then
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -4005,6 +4145,21 @@ fi
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+ifelse([$1],[CXX],
+[case $host_os in
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
+    ;;
+  esac
+esac
+])
+
 case " $_LT_AC_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
@@ -4055,12 +4210,16 @@ lt_simple_link_test_code="      program t\n      end\n"
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+_LT_CC_BASENAME([$compiler])
 
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
@@ -4070,7 +4229,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -4078,8 +4237,10 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 AC_MSG_RESULT([$enable_shared])
@@ -4130,20 +4291,27 @@ _LT_AC_TAGVAR(objext, $1)=$objext
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+
 AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 AC_LIBTOOL_PROG_COMPILER_PIC($1)
 AC_LIBTOOL_PROG_CC_C_O($1)
@@ -4186,11 +4354,16 @@ lt_simple_link_test_code="$lt_simple_compile_test_code"
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 _LT_AC_SYS_COMPILER
 
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 _LT_AC_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
 _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
 AC_LIBTOOL_CONFIG($1)
@@ -4220,7 +4393,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -4326,7 +4499,7 @@ ifelse([$1], [],
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -4337,11 +4510,11 @@ ifelse([$1], [],
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -4372,6 +4545,12 @@ fast_install=$enable_fast_install
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -4414,7 +4593,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -4433,7 +4612,7 @@ objext="$ac_objext"
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -4448,7 +4627,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -4722,9 +4901,6 @@ symcode='[[BCDEGRST]]'
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -4746,6 +4922,13 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[[ABCDGIRSTW]]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[[BCDEGRST]]'
   ;;
@@ -4777,8 +4960,11 @@ esac
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -4942,7 +5128,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -4967,18 +5153,28 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -4986,22 +5182,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 	    if test "$host_cpu" != ia64; then
 	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -5016,7 +5212,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -5027,18 +5223,24 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       linux*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 	    ;;
-	  cxx)
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -5055,25 +5257,25 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -5089,7 +5291,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       sco*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 	    ;;
 	  *)
@@ -5098,13 +5300,13 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 	    ;;
@@ -5114,12 +5316,12 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 	    ;;
@@ -5129,7 +5331,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    ;;
@@ -5200,7 +5402,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -5226,6 +5428,16 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -5237,7 +5449,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -5261,12 +5473,19 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
       ccc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
@@ -5287,9 +5506,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       ;;
 
     solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -5311,6 +5535,11 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
       fi
       ;;
 
+    unicos*)
+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
     uts4*)
       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -5338,7 +5567,7 @@ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
@@ -5371,7 +5600,10 @@ ifelse([$1],[CXX],[
     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux*)
+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
   ;;
   *)
     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5414,7 +5646,8 @@ ifelse([$1],[CXX],[
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
-
+  # Just being paranoid about ensuring that cc_basename is set.
+  _LT_CC_BASENAME([$compiler])
   case $host_os in
   cygwin* | mingw* | pw32*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -5434,6 +5667,27 @@ ifelse([$1],[CXX],[
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -5484,7 +5738,7 @@ EOF
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_AC_TAGVAR(always_export_symbols, $1)=no
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -5498,11 +5752,43 @@ EOF
 	fi~
 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       else
-	ld_shlibs=no
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+      else
+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -5540,31 +5826,6 @@ EOF
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-      fi
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -5575,16 +5836,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       ;;
     esac
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
+      runpath_var=
+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -5648,7 +5904,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -5669,6 +5925,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -5713,7 +5972,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  # Exported symbols can be pulled into shared objects from archives
 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
 	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  # This is similar to how AIX traditionally builds its shared libraries.
 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
@@ -5727,7 +5986,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       _LT_AC_TAGVAR(ld_shlibs, $1)=no
       ;;
 
-    bsdi4*)
+    bsdi[[45]]*)
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
@@ -5741,64 +6000,64 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[[012]])
+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[[012]])
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
       _LT_AC_TAGVAR(hardcode_direct, $1)=no
       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+          ;;
+      esac
     fi
       ;;
 
@@ -5832,7 +6091,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -5857,7 +6116,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -5866,7 +6125,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -5876,7 +6135,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
@@ -5919,7 +6178,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -5943,6 +6202,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
@@ -5988,7 +6248,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6007,10 +6267,12 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
     solaris*)
       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -6019,8 +6281,18 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
@@ -6281,7 +6553,7 @@ lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -6306,68 +6578,167 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
     fi
   done
 done
-SED=$lt_cv_path_SED
 ])
+SED=$lt_cv_path_SED
 AC_MSG_RESULT([$SED])
 ])
 
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# 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.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
 
-dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
-dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
-dnl also defines GSTUFF_PKG_ERRORS on error
-AC_DEFUN([PKG_CHECK_MODULES], [
-  succeeded=no
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
 
-  if test -z "$PKG_CONFIG"; then
-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-  fi
 
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        AC_MSG_CHECKING(for $2)
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
 
-        if $PKG_CONFIG --exists "$2" ; then
-            AC_MSG_RESULT(yes)
-            succeeded=yes
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
 
-            AC_MSG_CHECKING($1_CFLAGS)
-            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
-            AC_MSG_RESULT($$1_CFLAGS)
 
-            AC_MSG_CHECKING($1_LIBS)
-            $1_LIBS=`$PKG_CONFIG --libs "$2"`
-            AC_MSG_RESULT($$1_LIBS)
-        else
-            $1_CFLAGS=""
-            $1_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but 
-            ## do set a variable so people can do so.
-            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
         fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-        AC_SUBST($1_CFLAGS)
-        AC_SUBST($1_LIBS)
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
 
-  if test $succeeded = yes; then
-     ifelse([$3], , :, [$3])
-  else
-     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
-  fi
-])
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[$4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
 
+_PKG_TEXT
 
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
 
 # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
 #
@@ -6386,7 +6757,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -6497,230 +6868,6 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
 # Free Software Foundation, Inc.
 #
@@ -6932,58 +7079,6 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 
 AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
 # Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
@@ -7115,6 +7210,23 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
diff --git a/configure b/configure
index 5fd1e63..a97e889 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.130 .
+# From configure.ac Revision: 1.131 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc1.
+# Generated by GNU Autoconf 2.59 for gutenprint 5.0.0-rc2.
 #
 # Report bugs to <gimp-print-devel@lists.sourceforge.net>.
 #
@@ -298,15 +298,15 @@ fi
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test -z "$ECHO"; then
 if test "X${echo_test_string+set}" != Xset; then
 # find a string as large as possible, as long as the shell can cope with it
   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
+       echo_test_string=`eval $cmd` &&
        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
     then
       break
@@ -441,8 +441,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='gutenprint'
 PACKAGE_TARNAME='gutenprint'
-PACKAGE_VERSION='5.0.0-rc1'
-PACKAGE_STRING='gutenprint 5.0.0-rc1'
+PACKAGE_VERSION='5.0.0-rc2'
+PACKAGE_STRING='gutenprint 5.0.0-rc2'
 PACKAGE_BUGREPORT='gimp-print-devel@lists.sourceforge.net'
 
 ac_unique_file="src/main/print-vars.c"
@@ -483,7 +483,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprintui_cflags gutenprintui_libs gutenprintui2_cflags gutenprintui2_libs LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS GUTENPRINT_MAJOR_VERSION GUTENPRINT_MINOR_VERSION GUTENPRINT_MICRO_VERSION GUTENPRINT_CURRENT_INTERFACE GUTENPRINT_INTERFACE_AGE GUTENPRINT_BINARY_AGE GUTENPRINT_VERSION GUTENPRINTUI_CURRENT_INTERFACE GUTENPRINTUI_INTERFACE_AGE GUTENPRINTUI_BINARY_AGE GUTENPRINTUI2_CURRENT_INTERFACE GUTENPRINTUI2_INTERFACE_AGE GUTENPRINTUI2_BINARY_AGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar ALL_LINGUAS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CUPS_CONFIG FOOMATIC_CONFIGURE FOOMATIC_PPDFILE IJS_CONFIG GIMPTOOL_CHECK GTK_CONFIG GTK_CFLAGS GTK_LIBS GIMPTOOL2_CHECK PKG_CONFIG ac_pt_PKG_CONFIG GTK2_CFLAGS GTK2_LIBS GIMP2_CFLAGS GIMP2_LIBS LEX LEXLIB LEX_OUTPUT_ROOT YACC FIND PERL GLIB_MKENUMS CONVERT TEXI2HTML DVIPS DB2PDF DVIPDF DB2PS DB2HTML DOXYGEN DIALOG FOOMATIC_KITLOAD MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNUCFLAGS GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GIMPTOOL GIMP_CFLAGS GIMP_LIBS GIMP_CFLAGS_NOUI GIMP_LIBS_NOUI GIMP_DATA_DIR GIMP_PLUGIN_DIR BUILD_FOOMATIC_TRUE BUILD_FOOMATIC_FALSE BUILD_FOOMATIC_3_TRUE BUILD_FOOMATIC_3_FALSE BUILD_GHOSTSCRIPT_TRUE BUILD_GHOSTSCRIPT_FALSE BUILD_CUPS_TRUE BUILD_CUPS_FALSE BUILD_CUPS_PPDS_TRUE BUILD_CUPS_PPDS_FALSE CUPS_PPDS_AT_TOP_LEVEL_TRUE CUPS_PPDS_AT_TOP_LEVEL_FALSE BUILD_TRANSLATED_CUPS_PPDS_TRUE BUILD_TRANSLATED_CUPS_PPDS_FALSE USE_LEVEL3_PS_TRUE USE_LEVEL3_PS_FALSE BUILD_ESCPUTIL_TRUE BUILD_ESCPUTIL_FALSE BUILD_TEST_TRUE BUILD_TEST_FALSE BUILD_TESTPATTERN_TRUE BUILD_TESTPATTERN_FALSE BUILD_LIBGUTENPRINTUI_TRUE BUILD_LIBGUTENPRINTUI_FALSE BUILD_LIBGUTENPRINTUI2_TRUE BUILD_LIBGUTENPRINTUI2_FALSE BUILD_GIMP_TRUE BUILD_GIMP_FALSE BUILD_GIMP2_TRUE BUILD_GIMP2_FALSE INSTALL_SAMPLES_TRUE INSTALL_SAMPLES_FALSE INSTALL_USER_GUIDE_TRUE INSTALL_USER_GUIDE_FALSE USE_NLS_TRUE USE_NLS_FALSE BUILD_MODULES_TRUE BUILD_MODULES_FALSE BUILD_GENPPD_STATIC_TRUE BUILD_GENPPD_STATIC_FALSE RELEASE_DATE cups_prefix cups_exec_prefix cups_bindir cups_sbindir cups_conf_datadir cups_conf_serverbin cups_conf_serverroot CUPS_CFLAGS CUPS_LIBS CUPS_PPD_PS_LEVEL GENPPD_LIBS IJS_CFLAGS IJS_LIBS RM gimp_plug_indir gimp2_plug_indir GUTENPRINT_CFLAGS GUTENPRINT_LIBS GUTENPRINT_LIBDEPS GUTENPRINTUI_CFLAGS GUTENPRINTUI_LIBS GUTENPRINTUI_LIBDEPS GUTENPRINTUI_VERSION GUTENPRINTUI2_CFLAGS GUTENPRINTUI2_LIBS GUTENPRINTUI2_LIBDEPS GUTENPRINTUI2_VERSION gutenprint_cflags gutenprint_libs gutenprintui_cflags gutenprintui_libs gutenprintui2_cflags gutenprintui2_libs LIBREADLINE_DEPS MAINTAINER_CFLAGS PLUG_IN_PATH LIBOBJS LTLIBOBJS LTALLOCA'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -964,6 +964,26 @@ ac_env_FFLAGS_set=${FFLAGS+set}
 ac_env_FFLAGS_value=$FFLAGS
 ac_cv_env_FFLAGS_set=${FFLAGS+set}
 ac_cv_env_FFLAGS_value=$FFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_env_GTK2_CFLAGS_set=${GTK2_CFLAGS+set}
+ac_env_GTK2_CFLAGS_value=$GTK2_CFLAGS
+ac_cv_env_GTK2_CFLAGS_set=${GTK2_CFLAGS+set}
+ac_cv_env_GTK2_CFLAGS_value=$GTK2_CFLAGS
+ac_env_GTK2_LIBS_set=${GTK2_LIBS+set}
+ac_env_GTK2_LIBS_value=$GTK2_LIBS
+ac_cv_env_GTK2_LIBS_set=${GTK2_LIBS+set}
+ac_cv_env_GTK2_LIBS_value=$GTK2_LIBS
+ac_env_GIMP2_CFLAGS_set=${GIMP2_CFLAGS+set}
+ac_env_GIMP2_CFLAGS_value=$GIMP2_CFLAGS
+ac_cv_env_GIMP2_CFLAGS_set=${GIMP2_CFLAGS+set}
+ac_cv_env_GIMP2_CFLAGS_value=$GIMP2_CFLAGS
+ac_env_GIMP2_LIBS_set=${GIMP2_LIBS+set}
+ac_env_GIMP2_LIBS_value=$GIMP2_LIBS
+ac_cv_env_GIMP2_LIBS_set=${GIMP2_LIBS+set}
+ac_cv_env_GIMP2_LIBS_value=$GIMP2_LIBS
 
 #
 # Report the --help message.
@@ -972,7 +992,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gutenprint 5.0.0-rc1 to adapt to many kinds of systems.
+\`configure' configures gutenprint 5.0.0-rc2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1038,7 +1058,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gutenprint 5.0.0-rc1:";;
+     short | recursive ) echo "Configuration of gutenprint 5.0.0-rc2:";;
    esac
   cat <<\_ACEOF
 
@@ -1051,8 +1071,6 @@ Optional Features:
                           build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
@@ -1131,6 +1149,12 @@ Some influential environment variables:
   CXXCPP      C++ preprocessor
   F77         Fortran 77 compiler command
   FFLAGS      Fortran 77 compiler flags
+  PKG_CONFIG  path to pkg-config utility
+  GTK2_CFLAGS C compiler flags for GTK2, overriding pkg-config
+  GTK2_LIBS   linker flags for GTK2, overriding pkg-config
+  GIMP2_CFLAGS
+              C compiler flags for GIMP2, overriding pkg-config
+  GIMP2_LIBS  linker flags for GIMP2, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1224,14 +1248,14 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
 
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-gutenprint configure 5.0.0-rc1
+gutenprint configure 5.0.0-rc2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1262,7 +1286,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gutenprint $as_me 5.0.0-rc1, which was
+It was created by gutenprint $as_me 5.0.0-rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1632,11 +1656,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 GUTENPRINT_MAJOR_VERSION=5
 GUTENPRINT_MINOR_VERSION=0
 GUTENPRINT_MICRO_VERSION=0
-GUTENPRINT_EXTRA_VERSION=-rc1
+GUTENPRINT_EXTRA_VERSION=-rc2
 GUTENPRINT_CURRENT_INTERFACE=2
 GUTENPRINT_INTERFACE_AGE=0
 GUTENPRINT_BINARY_AGE=0
-GUTENPRINT_VERSION=5.0.0-rc1
+GUTENPRINT_VERSION=5.0.0-rc2
 GUTENPRINTUI_CURRENT_INTERFACE=1
 GUTENPRINTUI_INTERFACE_AGE=0
 GUTENPRINTUI_BINARY_AGE=0
@@ -1952,8 +1976,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=gutenprint
- VERSION=5.0.0-rc1
+ PACKAGE='gutenprint'
+ VERSION='5.0.0-rc2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2077,7 +2101,88 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+
+echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+echo $ECHO_N "checking how to create a ustar tar archive... $ECHO_C" >&6
+# Loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar plaintar pax cpio none'
+_am_tools=${am_cv_prog_tar_ustar-$_am_tools}
+# Do not fold the above two line into one, because Tru64 sh and
+# Solaris sh will not grok spaces in the rhs of `-'.
+for _am_tool in $_am_tools
+do
+  case $_am_tool in
+  gnutar)
+    for _am_tar in tar gnutar gtar;
+    do
+      { echo "$as_me:$LINENO: $_am_tar --version" >&5
+   ($_am_tar --version) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && break
+    done
+    am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"'
+    am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"'
+    am__untar="$_am_tar -xf -"
+    ;;
+  plaintar)
+    # Must skip GNU tar: if it does not support --format= it doesn't create
+    # ustar tarball either.
+    (tar --version) >/dev/null 2>&1 && continue
+    am__tar='tar chf - "$$tardir"'
+    am__tar_='tar chf - "$tardir"'
+    am__untar='tar xf -'
+    ;;
+  pax)
+    am__tar='pax -L -x ustar -w "$$tardir"'
+    am__tar_='pax -L -x ustar -w "$tardir"'
+    am__untar='pax -r'
+    ;;
+  cpio)
+    am__tar='find "$$tardir" -print | cpio -o -H ustar -L'
+    am__tar_='find "$tardir" -print | cpio -o -H ustar -L'
+    am__untar='cpio -i -H ustar -d'
+    ;;
+  none)
+    am__tar=false
+    am__tar_=false
+    am__untar=false
+    ;;
+  esac
+
+  # If the value was cached, stop now.  We just wanted to have am__tar
+  # and am__untar set.
+  test -n "${am_cv_prog_tar_ustar}" && break
+
+  # tar/untar a dummy directory, and stop if the command works
+  rm -rf conftest.dir
+  mkdir conftest.dir
+  echo GrepMe > conftest.dir/file
+  { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+   (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  rm -rf conftest.dir
+  if test -s conftest.tar; then
+    { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+   ($am__untar <conftest.tar) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+  fi
+done
+rm -rf conftest.dir
+
+if test "${am_cv_prog_tar_ustar+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  am_cv_prog_tar_ustar=$_am_tool
+fi
+
+echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+echo "${ECHO_T}$am_cv_prog_tar_ustar" >&6
 
 
 
@@ -2235,71 +2340,6 @@ host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
-DEPDIR="${am__leading_dot}deps"
-
-          ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2868,8 +2908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2927,8 +2966,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3044,8 +3082,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3099,8 +3136,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3145,8 +3181,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3190,8 +3225,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3230,115 +3264,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
 echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
 if test "${lt_cv_path_SED+set}" = set; then
@@ -3364,7 +3289,7 @@ lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
 # along with /bin/sed that truncates output.
 for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
+  test ! -f $lt_ac_sed && continue
   cat /dev/null > conftest.in
   lt_ac_count=0
   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -3389,10 +3314,10 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
     fi
   done
 done
-SED=$lt_cv_path_SED
 
 fi
 
+SED=$lt_cv_path_SED
 echo "$as_me:$LINENO: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
@@ -3469,7 +3394,7 @@ else
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -3503,7 +3428,7 @@ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -3533,6 +3458,15 @@ case $reload_flag in
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  darwin*)
+    if test "$GCC" = yes; then
+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
 
 echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -3619,21 +3553,21 @@ beos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-bsdi4*)
+bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
-  # win32_libid is a shell function defined in ltmain.sh
+  # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='win32_libid'
+  lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
-  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
@@ -3642,13 +3576,13 @@ darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-freebsd* | kfreebsd*-gnu)
+freebsd* | kfreebsd*-gnu | dragonfly*)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
@@ -3664,7 +3598,7 @@ gnu*)
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
@@ -3692,19 +3626,10 @@ irix5* | irix6* | nonstopux*)
 
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64)
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    # this will be overridden with pass_all, but let us keep it just in case
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-netbsd*)
+netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
@@ -3723,12 +3648,10 @@ nto-qnx*)
   ;;
 
 openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   fi
   ;;
 
@@ -3821,7 +3744,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3824 "configure"' > conftest.$ac_ext
+  echo '#line 3747 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3864,7 +3787,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
+    case `/usr/bin/file conftest.o` in
     *32-bit*)
       case $host in
         x86_64-*linux*)
@@ -3941,8 +3864,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4251,8 +4173,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4422,8 +4343,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4490,8 +4410,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4751,8 +4670,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4810,8 +4728,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4882,8 +4799,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4927,8 +4843,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4961,116 +4876,12 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-depcc="$CXX"  am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
 
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-ac_ext=cc
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -5300,6 +5111,8 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+fi
+
 
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -5393,7 +5206,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5396:" \
+echo "$as_me:5209:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5439,8 +5252,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5489,8 +5301,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5548,7 +5359,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     i=0
-  testring="ABCD"
+  teststring="ABCD"
 
   case $build_os in
   msdosdjgpp*)
@@ -5583,20 +5394,47 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
- *)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  *)
     # If test is not a shell built-in, we'll probably end up computing a
     # maximum length that is only half of the actual maximum length, but
     # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
+	       = "XX$teststring") >/dev/null 2>&1 &&
+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 	    lt_cv_sys_max_cmd_len=$new_result &&
 	    test $i != 17 # 1/2 MB should be enough
     do
       i=`expr $i + 1`
-      testring=$testring$testring
+      teststring=$teststring$teststring
     done
-    testring=
+    teststring=
     # Add a significant safety factor because C++ compilers can tack on massive
     # amounts of additional arguments before passing them to the linker.
     # It appears as though 1/2 is a usable value.
@@ -5633,9 +5471,6 @@ symcode='[BCDEGRST]'
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
 # Transform an extracted symbol line into a proper C declaration
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 
@@ -5657,6 +5492,13 @@ hpux*) # Its linker distinguishes data from code symbols
   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
   ;;
+linux*)
+  if test "$host_cpu" = ia64; then
+    symcode='[ABCDGIRSTW]'
+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+  fi
+  ;;
 irix* | nonstopux*)
   symcode='[BCDEGRST]'
   ;;
@@ -5688,8 +5530,11 @@ esac
 # Try without a prefix undercore, then with it.
 for ac_symprfx in "" "_"; do
 
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
   # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -5851,7 +5696,7 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
@@ -5871,7 +5716,7 @@ rm="rm -f"
 default_ofile=libtool
 can_build_shared=yes
 
-# All known linkers require a `.a' archive for static linking (except M$VC,
+# All known linkers require a `.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 ltmain="$ac_aux_dir/ltmain.sh"
@@ -6156,6 +6001,17 @@ if test -n "$RANLIB"; then
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
 
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
 # Only perform the check for file, if the check method requires it
 case $deplibs_check_method in
 file_magic*)
@@ -6181,7 +6037,7 @@ else
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -6243,7 +6099,7 @@ else
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
@@ -6342,6 +6198,20 @@ LTCC=${LTCC-"$CC"}
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 #
 # Check for any special shared library compilation flags.
 #
@@ -6378,11 +6248,16 @@ else
    LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
    printf "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
+     # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
+       $echo "X$_lt_linker_boilerplate" | $Xsed > conftest.exp
+       $SED '/^$/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_prog_compiler_static_works=yes
+       fi
      else
        lt_prog_compiler_static_works=yes
      fi
@@ -6424,18 +6299,20 @@ else
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6430: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6305: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6434: \$? = $ac_status" >&5
+   echo "$as_me:6309: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -6512,7 +6389,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -6538,6 +6415,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic='-qnocommon'
+         lt_prog_compiler_wl='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -6549,7 +6436,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -6573,12 +6460,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl='-Wl,'
+	lt_prog_compiler_pic='-fpic'
+	lt_prog_compiler_static='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl='-Wl,'
         # All Alpha code is PIC.
@@ -6599,9 +6493,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       ;;
 
     solaris*)
-      lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -6623,6 +6522,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       fi
       ;;
 
+    unicos*)
+      lt_prog_compiler_wl='-Wl,'
+      lt_prog_compiler_can_build_shared=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic='-pic'
       lt_prog_compiler_static='-Bstatic'
@@ -6657,18 +6561,20 @@ else
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6663: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6567: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6667: \$? = $ac_status" >&5
+   echo "$as_me:6571: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works=yes
      fi
    fi
@@ -6689,7 +6595,7 @@ else
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
@@ -6717,23 +6623,25 @@ else
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6723: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6629: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6727: \$? = $ac_status" >&5
+   echo "$as_me:6633: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -6809,6 +6717,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -6829,6 +6747,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -6879,7 +6818,7 @@ EOF
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -6897,7 +6836,39 @@ EOF
       fi
       ;;
 
-    netbsd*)
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	link_all_deplibs=no
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -6935,31 +6906,6 @@ EOF
       hardcode_shlibpath_var=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -6970,16 +6916,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       ;;
     esac
 
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
+    if test "$ld_shlibs" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec=
+      export_dynamic_flag_spec=
+      whole_archive_flag_spec=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -7043,7 +6984,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       link_all_deplibs=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -7064,6 +7005,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -7111,8 +7055,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7172,8 +7115,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7210,7 +7152,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec=' '
 	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
@@ -7224,7 +7166,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ld_shlibs=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
@@ -7238,7 +7180,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
@@ -7250,52 +7192,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc=no
       hardcode_direct=no
       hardcode_automatic=yes
       hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
+      whole_archive_flag_spec=''
       link_all_deplibs=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs=no
+          ;;
+      esac
     fi
       ;;
 
@@ -7329,7 +7271,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
@@ -7354,7 +7296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -7363,7 +7305,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -7373,7 +7315,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld='+b $libdir'
@@ -7416,7 +7358,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -7440,6 +7382,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec='${wl}-E'
       else
@@ -7485,7 +7428,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -7504,10 +7447,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     solaris*)
       no_undefined_flag=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -7516,8 +7461,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs=yes
       ;;
@@ -7694,7 +7649,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -7791,7 +7746,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -7807,7 +7762,7 @@ bsdi4*)
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -7819,7 +7774,8 @@ cygwin* | mingw* | pw32*)
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -7849,7 +7805,7 @@ cygwin* | mingw* | pw32*)
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -7872,7 +7828,7 @@ darwin* | rhapsody*)
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -7907,8 +7863,17 @@ kfreebsd*-gnu)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -7926,7 +7891,7 @@ freebsd*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -7953,9 +7918,9 @@ hpux9* | hpux10* | hpux11*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -7970,7 +7935,7 @@ hpux9* | hpux10* | hpux11*)
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -7981,7 +7946,7 @@ hpux9* | hpux10* | hpux11*)
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -8052,8 +8017,8 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -8065,6 +8030,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -8115,7 +8092,11 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -8135,7 +8116,7 @@ openbsd*)
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -8237,8 +8218,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"="Xyes" ; then
+   test -n "$runpath_var" || \
+   test "X$hardcode_automatic" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct" != no &&
@@ -8364,8 +8345,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8468,8 +8448,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8534,8 +8513,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8628,8 +8606,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8694,8 +8671,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8761,8 +8737,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8828,8 +8803,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -8904,7 +8878,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8907 "configure"
+#line 8881 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8970,7 +8944,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -9002,7 +8976,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9005 "configure"
+#line 8979 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9068,7 +9042,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -9118,7 +9092,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -9127,47 +9101,10 @@ aix3*)
   fi
   ;;
 
-aix4*)
+aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
     test "$enable_shared" = yes && enable_static=no
   fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
     ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -9193,7 +9130,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -9297,7 +9234,7 @@ echo "$as_me: creating $ofile" >&6;}
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -9308,11 +9245,11 @@ echo "$as_me: creating $ofile" >&6;}
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
+Xsed="$SED -e 1s/^X//"
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # The names of the tagged configurations supported by this script.
 available_tags=
@@ -9342,6 +9279,12 @@ fast_install=$enable_fast_install
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -9384,7 +9327,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -9403,7 +9346,7 @@ objext="$ac_objext"
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -9418,7 +9361,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -9713,7 +9656,9 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
 
       case $tagname in
       CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+	    (test "X$CXX" != "Xg++"))) ; then
 	  ac_ext=cc
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9750,7 +9695,7 @@ postdeps_CXX=
 compiler_lib_search_path_CXX=
 
 # Source file extension for C++ test sources.
-ac_ext=cc
+ac_ext=cpp
 
 # Object file extension for compiled C++ test sources.
 objext=o
@@ -9771,6 +9716,20 @@ LTCC=${LTCC-"$CC"}
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC=$CC
 lt_save_LD=$LD
@@ -9792,7 +9751,16 @@ test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
 compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # We don't want -fno-exception wen compiling C++ code, so set the
 # no_builtin_flag separately
@@ -9863,7 +9831,7 @@ else
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD="$ac_dir/$ac_prog"
       # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
+      # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
@@ -9897,7 +9865,7 @@ echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -10006,7 +9974,7 @@ case $host_os in
     link_all_deplibs_CXX=yes
 
     if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
+      case $host_os in aix4.[012]|aix4.[012].*)
       # We only want to do this on AIX 4.2 and lower, the check
       # below for broken collect2 doesn't work under 4.3+
 	collect2name=`${CC} -print-prog-name=collect2`
@@ -10027,6 +9995,9 @@ case $host_os in
 	fi
       esac
       shared_flag='-shared'
+      if test "$aix_use_runtimelinking" = yes; then
+	shared_flag="$shared_flag "'${wl}-G'
+      fi
     else
       # not using gcc
       if test "$host_cpu" = ia64; then
@@ -10074,8 +10045,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10136,8 +10106,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -10174,7 +10143,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# Exported symbols can be pulled into shared objects from archives
 	whole_archive_flag_spec_CXX=' '
 	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
+	# This is similar to how AIX traditionally builds its shared libraries.
 	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
@@ -10188,6 +10157,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
     ;;
 
+
   cygwin* | mingw* | pw32*)
     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
     # as there is no search path for DLLs.
@@ -10211,65 +10181,76 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ld_shlibs_CXX=no
     fi
   ;;
+      darwin* | rhapsody*)
+        case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
+        esac
+      archive_cmds_need_lc_CXX=no
+      hardcode_direct_CXX=no
+      hardcode_automatic_CXX=yes
+      hardcode_shlibpath_var_CXX=unsupported
+      whole_archive_flag_spec_CXX=''
+      link_all_deplibs_CXX=yes
 
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+    if test "$GXX" = yes ; then
+      lt_int_apple_cc_single_mod=no
+      output_verbose_link_cmd='echo'
+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+       lt_int_apple_cc_single_mod=yes
+      fi
+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
       else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-            ;;
-        esac
+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+        fi
+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          else
+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          fi
+            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      else
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_CXX=no
+          ;;
+      esac
       fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
+        ;;
 
   dgux*)
     case $cc_basename in
-      ec++)
+      ec++*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      ghcx)
+      ghcx*)
 	# Green Hills C++ Compiler
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -10280,14 +10261,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  freebsd12*)
+  freebsd[12]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
     ld_shlibs_CXX=no
     ;;
   freebsd-elf*)
     archive_cmds_need_lc_CXX=no
     ;;
-  freebsd* | kfreebsd*-gnu)
+  freebsd* | kfreebsd*-gnu | dragonfly*)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=yes
@@ -10304,11 +10285,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 				# location of the library.
 
     case $cc_basename in
-    CC)
+    CC*)
       # FIXME: insert proper C++ library support
       ld_shlibs_CXX=no
       ;;
-    aCC)
+    aCC*)
       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
@@ -10318,7 +10299,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # explicitly linking system object files so we need to strip them
       # from the output so that they don't get included in the library
       # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
       ;;
     *)
       if test "$GXX" = yes; then
@@ -10332,7 +10313,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   hpux10*|hpux11*)
     if test $with_gnu_ld = no; then
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*)
 	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
@@ -10348,7 +10329,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         ;;
       esac
     fi
-    case "$host_cpu" in
+    case $host_cpu in
     hppa*64*)
       hardcode_direct_CXX=no
       hardcode_shlibpath_var_CXX=no
@@ -10369,12 +10350,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     esac
 
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      aCC)
-	case "$host_cpu" in
+      aCC*)
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	  ;;
@@ -10395,7 +10376,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *)
 	if test "$GXX" = yes; then
 	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    ia64*|hppa*64*)
 	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
 	      ;;
@@ -10413,9 +10394,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   irix5* | irix6*)
     case $cc_basename in
-      CC)
+      CC*)
 	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	# Archives containing C++ object files must be created using
 	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -10426,7 +10407,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *)
 	if test "$GXX" = yes; then
 	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	  else
 	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 	  fi
@@ -10439,7 +10420,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   linux*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -10464,17 +10445,41 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 	;;
-      icpc)
+      icpc*)
 	# Intel C++
 	with_gnu_ld=yes
+	# version 8.0 and above of icpc choke on multiply defined symbols
+	# if we add $predep_objects and $postdep_objects, however 7.1 and
+	# earlier do not add the objects themselves.
+	case `$CC -V 2>&1` in
+	*"Version 7."*)
+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	*)  # Version 8.0 or newer
+	  tmp_idyn=
+	  case $host_cpu in
+	    ia64*) tmp_idyn=' -i_dynamic';;
+	  esac
+  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	  ;;
+	esac
 	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 	;;
-      cxx)
+      pgCC*)
+        # Portland Group C++ compiler
+	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+
+	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+        ;;
+      cxx*)
 	# Compaq C++
 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
@@ -10505,7 +10510,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   mvs*)
     case $cc_basename in
-      cxx)
+      cxx*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -10515,7 +10520,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
@@ -10526,9 +10531,25 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
     ;;
+  openbsd2*)
+    # C++ shared libraries are fairly broken
+    ld_shlibs_CXX=no
+    ;;
+  openbsd*)
+    hardcode_direct_CXX=yes
+    hardcode_shlibpath_var_CXX=no
+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
+      export_dynamic_flag_spec_CXX='${wl}-E'
+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+    fi
+    output_verbose_link_cmd='echo'
+    ;;
   osf3*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -10544,14 +10565,14 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
 
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	hardcode_libdir_separator_CXX=:
@@ -10569,7 +10590,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -10588,7 +10609,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   osf4* | osf5*)
     case $cc_basename in
-      KCC)
+      KCC*)
 	# Kuck and Associates, Inc. (KAI) C++ Compiler
 
 	# KCC will only create a shared library if the output file
@@ -10603,17 +10624,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# the KAI C++ compiler.
 	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
 	;;
-      RCC)
+      RCC*)
 	# Rational C++ 2.4.1
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      cxx)
+      cxx*)
 	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
+	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
 	  $rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -10632,7 +10653,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *)
 	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 
 	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	  hardcode_libdir_separator_CXX=:
@@ -10656,7 +10677,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
   sco*)
     archive_cmds_need_lc_CXX=no
     case $cc_basename in
-      CC)
+      CC*)
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
@@ -10668,12 +10689,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   sunos4*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.x
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
 	;;
-      lcc)
+      lcc*)
 	# Lucid
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -10686,36 +10707,33 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   solaris*)
     case $cc_basename in
-      CC)
+      CC*)
 	# Sun C++ 4.2, 5.x and Centerline C++
+        archive_cmds_need_lc_CXX=yes
 	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
 	hardcode_libdir_flag_spec_CXX='-R$libdir'
 	hardcode_shlibpath_var_CXX=no
 	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
+	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 	  *)
 	    # The C++ compiler is used as linker so we must use $wl
 	    # flag to pass the commands to the underlying system
-	    # linker.
+	    # linker. We must also pass each convience library through
+	    # to the system linker between allextract/defaultextract.
+	    # The C++ compiler will combine linker options so we
+	    # cannot just pass the convience library names through
+	    # without $wl.
 	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 	    ;;
 	esac
 	link_all_deplibs_CXX=yes
 
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+	output_verbose_link_cmd='echo'
 
 	# Archives containing C++ object files must be created using
 	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -10723,7 +10741,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	# in the archive.
 	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
 	;;
-      gcx)
+      gcx*)
 	# Green Hills C++ Compiler
 	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
@@ -10766,7 +10784,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     ;;
   tandem*)
     case $cc_basename in
-      NCC)
+      NCC*)
 	# NonStop-UX NCC 3.20
 	# FIXME: insert proper C++ library support
 	ld_shlibs_CXX=no
@@ -10819,7 +10837,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   # The `*' in the case matches for architectures that use `case' in
   # $output_verbose_cmd can trigger glob expansion during the loop
   # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 
   for p in `eval $output_verbose_link_cmd`; do
     case $p in
@@ -10895,6 +10913,20 @@ fi
 
 $rm -f confest.$objext
 
+# PORTME: override above test on systems where it is broken
+case $host_os in
+solaris*)
+  case $cc_basename in
+  CC*)
+    # Adding this requires a known-good setup of shared libraries for
+    # Sun compiler versions before 5.6, else PIC objects from an old
+    # archive will be linked into the output, leading to subtle bugs.
+    postdeps_CXX='-lCstd -lCrun'
+    ;;
+  esac
+esac
+
+
 case " $postdeps_CXX " in
 *" -lc "*) archive_cmds_need_lc_CXX=no ;;
 esac
@@ -10950,7 +10982,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	;;
       *)
@@ -10975,18 +11007,28 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       chorus*)
 	case $cc_basename in
-	cxch68)
+	cxch68*)
 	  # Green Hills C++ Compiler
 	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 	  ;;
 	esac
 	;;
+       darwin*)
+         # PIC is the default on this platform
+         # Common symbols not allowed in MH_DYLIB files
+         case $cc_basename in
+           xlc*)
+           lt_prog_compiler_pic_CXX='-qnocommon'
+           lt_prog_compiler_wl_CXX='-Wl,'
+           ;;
+         esac
+       ;;
       dgux*)
 	case $cc_basename in
-	  ec++)
+	  ec++*)
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
-	  ghcx)
+	  ghcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -10994,22 +11036,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	    ;;
 	esac
 	;;
-      freebsd* | kfreebsd*-gnu)
+      freebsd* | kfreebsd*-gnu | dragonfly*)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
 	    if test "$host_cpu" != ia64; then
 	      lt_prog_compiler_pic_CXX='+Z'
 	    fi
 	    ;;
-	  aCC)
+	  aCC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
+	    case $host_cpu in
 	    hppa*64*|ia64*)
 	      # +Z the default
 	      ;;
@@ -11024,7 +11066,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       irix5* | irix6* | nonstopux*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    # CC pic flag -KPIC is the default.
@@ -11035,18 +11077,24 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       linux*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    # KAI C++ Compiler
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
-	  icpc)
+	  icpc* | ecpc*)
 	    # Intel C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
 	    ;;
-	  cxx)
+	  pgCC*)
+	    # Portland Group C++ compiler.
+	    lt_prog_compiler_wl_CXX='-Wl,'
+	    lt_prog_compiler_pic_CXX='-fpic'
+	    lt_prog_compiler_static_CXX='-Bstatic'
+	    ;;
+	  cxx*)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
 	    # Linux and Compaq Tru64 Unix objects are PIC.
@@ -11063,25 +11111,25 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       mvs*)
 	case $cc_basename in
-	  cxx)
+	  cxx*)
 	    lt_prog_compiler_pic_CXX='-W c,exportall'
 	    ;;
 	  *)
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
-	  KCC)
+	  KCC*)
 	    lt_prog_compiler_wl_CXX='--backend -Wl,'
 	    ;;
-	  RCC)
+	  RCC*)
 	    # Rational C++ 2.4.1
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
-	  cxx)
+	  cxx*)
 	    # Digital/Compaq C++
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -11097,7 +11145,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       sco*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
 	  *)
@@ -11106,13 +11154,13 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       solaris*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    lt_prog_compiler_wl_CXX='-Qoption ld '
 	    ;;
-	  gcx)
+	  gcx*)
 	    # Green Hills C++ Compiler
 	    lt_prog_compiler_pic_CXX='-PIC'
 	    ;;
@@ -11122,12 +11170,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       sunos4*)
 	case $cc_basename in
-	  CC)
+	  CC*)
 	    # Sun C++ 4.x
 	    lt_prog_compiler_pic_CXX='-pic'
 	    lt_prog_compiler_static_CXX='-Bstatic'
 	    ;;
-	  lcc)
+	  lcc*)
 	    # Lucid
 	    lt_prog_compiler_pic_CXX='-pic'
 	    ;;
@@ -11137,7 +11185,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	;;
       tandem*)
 	case $cc_basename in
-	  NCC)
+	  NCC*)
 	    # NonStop-UX NCC 3.20
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    ;;
@@ -11178,18 +11226,20 @@ else
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11184: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11232: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11188: \$? = $ac_status" >&5
+   echo "$as_me:11236: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_CXX=yes
      fi
    fi
@@ -11210,7 +11260,7 @@ else
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_CXX=
@@ -11238,23 +11288,25 @@ else
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11244: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11294: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11248: \$? = $ac_status" >&5
+   echo "$as_me:11298: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -11309,7 +11361,10 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     export_symbols_cmds_CXX="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+  ;;
+  linux*)
+    link_all_deplibs_CXX=no
   ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -11392,7 +11447,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -11489,7 +11544,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11505,7 +11560,7 @@ bsdi4*)
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -11517,7 +11572,8 @@ cygwin* | mingw* | pw32*)
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -11547,7 +11603,7 @@ cygwin* | mingw* | pw32*)
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -11570,7 +11626,7 @@ darwin* | rhapsody*)
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -11605,8 +11661,17 @@ kfreebsd*-gnu)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -11624,7 +11689,7 @@ freebsd*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -11651,9 +11716,9 @@ hpux9* | hpux10* | hpux11*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -11668,7 +11733,7 @@ hpux9* | hpux10* | hpux11*)
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -11679,7 +11744,7 @@ hpux9* | hpux10* | hpux11*)
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -11750,8 +11815,8 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -11763,6 +11828,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -11813,7 +11890,11 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11833,7 +11914,7 @@ openbsd*)
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -11935,8 +12016,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
+   test -n "$runpath_var_CXX" || \
+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_CXX" != no &&
@@ -12062,8 +12143,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12166,8 +12246,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12232,8 +12311,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12326,8 +12404,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12392,8 +12469,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12459,8 +12535,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12526,8 +12601,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -12602,7 +12676,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12605 "configure"
+#line 12679 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12668,7 +12742,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -12700,7 +12774,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12703 "configure"
+#line 12777 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12766,7 +12840,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -12817,7 +12891,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -12918,6 +12992,12 @@ fast_install=$enable_fast_install
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -12960,7 +13040,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -12979,7 +13059,7 @@ objext="$ac_objext"
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -12994,7 +13074,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -13275,12 +13355,35 @@ LTCC=${LTCC-"$CC"}
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
 compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
@@ -13293,7 +13396,7 @@ test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
-case "$host_os" in
+case $host_os in
 aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
@@ -13301,8 +13404,10 @@ aix3*)
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
-aix4*)
-  test "$enable_shared" = yes && enable_static=no
+aix4* | aix5*)
+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+    test "$enable_shared" = yes && enable_static=no
+  fi
   ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -13379,7 +13484,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -13405,6 +13510,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_F77='-qnocommon'
+         lt_prog_compiler_wl_F77='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -13416,7 +13531,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_wl_F77='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -13440,12 +13555,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_F77='-Wl,'
 	lt_prog_compiler_pic_F77='-KPIC'
 	lt_prog_compiler_static_F77='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_F77='-Wl,'
+	lt_prog_compiler_pic_F77='-fpic'
+	lt_prog_compiler_static_F77='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_F77='-Wl,'
         # All Alpha code is PIC.
@@ -13466,9 +13588,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       ;;
 
     solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
       lt_prog_compiler_pic_F77='-KPIC'
       lt_prog_compiler_static_F77='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_F77='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_F77='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -13490,6 +13617,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       fi
       ;;
 
+    unicos*)
+      lt_prog_compiler_wl_F77='-Wl,'
+      lt_prog_compiler_can_build_shared_F77=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_F77='-pic'
       lt_prog_compiler_static_F77='-Bstatic'
@@ -13524,18 +13656,20 @@ else
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13530: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13662: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13534: \$? = $ac_status" >&5
+   echo "$as_me:13666: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_F77=yes
      fi
    fi
@@ -13556,7 +13690,7 @@ else
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_F77=
@@ -13584,23 +13718,25 @@ else
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13590: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13724: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13594: \$? = $ac_status" >&5
+   echo "$as_me:13728: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_F77=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -13676,6 +13812,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -13696,6 +13842,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_F77=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -13746,7 +13913,7 @@ EOF
       allow_undefined_flag_F77=unsupported
       always_export_symbols_F77=no
       enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -13760,11 +13927,43 @@ EOF
 	fi~
 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       else
-	ld_shlibs=no
+	ld_shlibs_F77=no
       fi
       ;;
 
-    netbsd*)
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	link_all_deplibs_F77=no
+      else
+	ld_shlibs_F77=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -13802,31 +14001,6 @@ EOF
       hardcode_shlibpath_var_F77=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_F77="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_F77="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_F77=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -13837,16 +14011,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       ;;
     esac
 
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
+    if test "$ld_shlibs_F77" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_F77=
+      export_dynamic_flag_spec_F77=
+      whole_archive_flag_spec_F77=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -13910,7 +14079,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       link_all_deplibs_F77=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -13931,6 +14100,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -13968,8 +14140,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14019,8 +14190,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -14057,7 +14227,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec_F77=' '
 	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
@@ -14071,7 +14241,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ld_shlibs_F77=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_F77=-rdynamic
       ;;
 
@@ -14085,64 +14255,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_F77='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_F77=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_F77='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_F77=no
       hardcode_direct_F77=no
       hardcode_automatic_F77=yes
       hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
+      whole_archive_flag_spec_F77=''
       link_all_deplibs_F77=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs_F77=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_F77=no
+          ;;
+      esac
     fi
       ;;
 
@@ -14176,7 +14346,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_F77='-R$libdir'
       hardcode_direct_F77=yes
@@ -14201,7 +14371,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -14210,7 +14380,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -14220,7 +14390,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
@@ -14263,7 +14433,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_F77=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -14287,6 +14457,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_F77=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_F77='${wl}-E'
       else
@@ -14332,7 +14503,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	allow_undefined_flag_F77=' -expect_unresolved \*'
 	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -14351,10 +14522,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     solaris*)
       no_undefined_flag_F77=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -14363,8 +14536,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_F77=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_F77=yes
       ;;
@@ -14541,7 +14724,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -14638,7 +14821,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14654,7 +14837,7 @@ bsdi4*)
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -14666,7 +14849,8 @@ cygwin* | mingw* | pw32*)
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -14696,7 +14880,7 @@ cygwin* | mingw* | pw32*)
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -14719,7 +14903,7 @@ darwin* | rhapsody*)
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -14754,8 +14938,17 @@ kfreebsd*-gnu)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -14773,7 +14966,7 @@ freebsd*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -14800,9 +14993,9 @@ hpux9* | hpux10* | hpux11*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -14817,7 +15010,7 @@ hpux9* | hpux10* | hpux11*)
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -14828,7 +15021,7 @@ hpux9* | hpux10* | hpux11*)
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -14899,8 +15092,8 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -14912,6 +15105,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -14962,7 +15167,11 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -14982,7 +15191,7 @@ openbsd*)
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -15084,8 +15293,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_F77=
 if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
+   test -n "$runpath_var_F77" || \
+   test "X$hardcode_automatic_F77" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_F77" != no &&
@@ -15161,7 +15370,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -15262,6 +15471,12 @@ fast_install=$enable_fast_install
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -15304,7 +15519,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -15323,7 +15538,7 @@ objext="$ac_objext"
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -15338,7 +15553,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -15576,7 +15791,7 @@ objext_GCJ=$objext
 lt_simple_compile_test_code="class foo {}\n"
 
 # Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
 
 # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 
@@ -15587,15 +15802,41 @@ LTCC=${LTCC-"$CC"}
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
 compiler_GCJ=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
 archive_cmds_need_lc_GCJ=no
 
+old_archive_cmds_GCJ=$old_archive_cmds
+
 
 lt_prog_compiler_no_builtin_flag_GCJ=
 
@@ -15618,18 +15859,20 @@ else
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15624: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15865: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15628: \$? = $ac_status" >&5
+   echo "$as_me:15869: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
@@ -15706,7 +15949,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
     hpux*)
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -15732,6 +15975,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
+      darwin*)
+        # PIC is the default on this platform
+        # Common symbols not allowed in MH_DYLIB files
+       case $cc_basename in
+         xlc*)
+         lt_prog_compiler_pic_GCJ='-qnocommon'
+         lt_prog_compiler_wl_GCJ='-Wl,'
+         ;;
+       esac
+       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
@@ -15743,7 +15996,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       lt_prog_compiler_wl_GCJ='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
-      case "$host_cpu" in
+      case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
@@ -15767,12 +16020,19 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       ;;
 
     linux*)
-      case $CC in
+      case $cc_basename in
       icc* | ecc*)
 	lt_prog_compiler_wl_GCJ='-Wl,'
 	lt_prog_compiler_pic_GCJ='-KPIC'
 	lt_prog_compiler_static_GCJ='-static'
         ;;
+      pgcc* | pgf77* | pgf90* | pgf95*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	lt_prog_compiler_wl_GCJ='-Wl,'
+	lt_prog_compiler_pic_GCJ='-fpic'
+	lt_prog_compiler_static_GCJ='-Bstatic'
+        ;;
       ccc*)
         lt_prog_compiler_wl_GCJ='-Wl,'
         # All Alpha code is PIC.
@@ -15793,9 +16053,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       ;;
 
     solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
       lt_prog_compiler_pic_GCJ='-KPIC'
       lt_prog_compiler_static_GCJ='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95*)
+	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
+      *)
+	lt_prog_compiler_wl_GCJ='-Wl,';;
+      esac
       ;;
 
     sunos4*)
@@ -15817,6 +16082,11 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
       fi
       ;;
 
+    unicos*)
+      lt_prog_compiler_wl_GCJ='-Wl,'
+      lt_prog_compiler_can_build_shared_GCJ=no
+      ;;
+
     uts4*)
       lt_prog_compiler_pic_GCJ='-pic'
       lt_prog_compiler_static_GCJ='-Bstatic'
@@ -15851,18 +16121,20 @@ else
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15857: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16127: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15861: \$? = $ac_status" >&5
+   echo "$as_me:16131: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
+     # So say no if there are warnings other than the usual output.
+     $echo "X$_lt_compiler_boilerplate" | $Xsed >conftest.exp
+     $SED '/^$/d' conftest.err >conftest.er2
+     if test ! -s conftest.err || diff conftest.exp conftest.er2 >/dev/null; then
        lt_prog_compiler_pic_works_GCJ=yes
      fi
    fi
@@ -15883,7 +16155,7 @@ else
 fi
 
 fi
-case "$host_os" in
+case $host_os in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic_GCJ=
@@ -15911,23 +16183,25 @@ else
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15917: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16189: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15921: \$? = $ac_status" >&5
+   echo "$as_me:16193: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     if test ! -s out/conftest.err; then
+     $echo "X$_lt_compiler_boilerplate" | $Xsed > out/conftest.exp
+     $SED '/^$/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.err || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_GCJ=yes
      fi
    fi
-   chmod u+w .
+   chmod u+w . 2>&5
    $rm conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
@@ -16003,6 +16277,16 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   extract_expsyms_cmds=
+  # Just being paranoid about ensuring that cc_basename is set.
+  for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 
   case $host_os in
   cygwin* | mingw* | pw32*)
@@ -16023,6 +16307,27 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      else
+  	whole_archive_flag_spec_GCJ=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v 2>/dev/null` in
+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix3* | aix4* | aix5*)
@@ -16073,7 +16378,7 @@ EOF
       allow_undefined_flag_GCJ=unsupported
       always_export_symbols_GCJ=no
       enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
@@ -16087,11 +16392,43 @@ EOF
 	fi~
 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
       else
-	ld_shlibs=no
+	ld_shlibs_GCJ=no
       fi
       ;;
 
-    netbsd*)
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+	tmp_addflag=
+	case $cc_basename,$host_cpu in
+	pgcc*)				# Portland Group C compiler
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	esac
+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+
+	if test $supports_anon_versioning = yes; then
+	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+  $echo "local: *; };" >> $output_objdir/$libname.ver~
+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+	fi
+	link_all_deplibs_GCJ=no
+      else
+	ld_shlibs_GCJ=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
@@ -16129,31 +16466,6 @@ EOF
       hardcode_shlibpath_var_GCJ=no
       ;;
 
-  linux*)
-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_GCJ="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-      fi
-    else
-      ld_shlibs_GCJ=no
-    fi
-    ;;
-
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -16164,16 +16476,11 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       ;;
     esac
 
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
+    if test "$ld_shlibs_GCJ" = no; then
+      runpath_var=
+      hardcode_libdir_flag_spec_GCJ=
+      export_dynamic_flag_spec_GCJ=
+      whole_archive_flag_spec_GCJ=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
@@ -16237,7 +16544,7 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
       link_all_deplibs_GCJ=yes
 
       if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
+	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`${CC} -print-prog-name=collect2`
@@ -16258,6 +16565,9 @@ $echo "local: *; };" >> $output_objdir/$libname.ver~
 	  fi
 	esac
 	shared_flag='-shared'
+	if test "$aix_use_runtimelinking" = yes; then
+	  shared_flag="$shared_flag "'${wl}-G'
+	fi
       else
 	# not using gcc
 	if test "$host_cpu" = ia64; then
@@ -16305,8 +16615,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16366,8 +16675,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -16404,7 +16712,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  # Exported symbols can be pulled into shared objects from archives
 	  whole_archive_flag_spec_GCJ=' '
 	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
+	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 	fi
       fi
@@ -16418,7 +16726,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ld_shlibs_GCJ=no
       ;;
 
-    bsdi4*)
+    bsdi[45]*)
       export_dynamic_flag_spec_GCJ=-rdynamic
       ;;
 
@@ -16432,64 +16740,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
-      shrext=".dll"
+      shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
       archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
       old_archive_From_new_cmds_GCJ='true'
       # FIXME: Should let the user specify the lib program.
       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
       enable_shared_with_static_runtimes_GCJ=yes
       ;;
 
     darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
+      case $host_os in
+        rhapsody* | darwin1.[012])
+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
+         ;;
+       *) # Darwin 1.3 on
+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+         else
+           case ${MACOSX_DEPLOYMENT_TARGET} in
+             10.[012])
+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+               ;;
+             10.*)
+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
+               ;;
+           esac
+         fi
+         ;;
       esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      archive_cmds_need_lc_GCJ=no
       hardcode_direct_GCJ=no
       hardcode_automatic_GCJ=yes
       hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
+      whole_archive_flag_spec_GCJ=''
       link_all_deplibs_GCJ=yes
+    if test "$GCC" = yes ; then
+    	output_verbose_link_cmd='echo'
+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     else
-      ld_shlibs_GCJ=no
+      case $cc_basename in
+        xlc*)
+         output_verbose_link_cmd='echo'
+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          ;;
+       *)
+         ld_shlibs_GCJ=no
+          ;;
+      esac
     fi
       ;;
 
@@ -16523,7 +16831,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
+    freebsd* | kfreebsd*-gnu | dragonfly*)
       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec_GCJ='-R$libdir'
       hardcode_direct_GCJ=yes
@@ -16548,7 +16856,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
@@ -16557,7 +16865,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	  ;;
 	esac
       else
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*|ia64*)
 	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  ;;
@@ -16567,7 +16875,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	esac
       fi
       if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
+	case $host_cpu in
 	hppa*64*)
 	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
@@ -16610,7 +16918,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       link_all_deplibs_GCJ=yes
       ;;
 
-    netbsd*)
+    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
@@ -16634,6 +16942,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_GCJ=no
       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 	export_dynamic_flag_spec_GCJ='${wl}-E'
       else
@@ -16679,7 +16988,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -16698,10 +17007,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
     solaris*)
       no_undefined_flag_GCJ=' -z text'
       if test "$GCC" = yes; then
+	wlarc='${wl}'
 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
+	wlarc=''
 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
   	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
@@ -16710,8 +17021,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       hardcode_shlibpath_var_GCJ=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+      *)
+ 	# The compiler driver will combine linker options so we
+ 	# cannot just pass the convience library names through
+ 	# without $wl, iff we do not link with $LD.
+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
+ 	case $wlarc in
+ 	'')
+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+ 	*)
+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
+ 	esac ;;
       esac
       link_all_deplibs_GCJ=yes
       ;;
@@ -16888,7 +17209,7 @@ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
-shrext=".so"
+shrext_cmds=".so"
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
@@ -16985,7 +17306,7 @@ beos*)
   shlibpath_var=LIBRARY_PATH
   ;;
 
-bsdi4*)
+bsdi[45]*)
   version_type=linux
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -17001,7 +17322,7 @@ bsdi4*)
 
 cygwin* | mingw* | pw32*)
   version_type=windows
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_version=no
   need_lib_prefix=no
 
@@ -17013,7 +17334,8 @@ cygwin* | mingw* | pw32*)
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $rm \$dlpath'
@@ -17043,7 +17365,7 @@ cygwin* | mingw* | pw32*)
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
     ;;
@@ -17066,7 +17388,7 @@ darwin* | rhapsody*)
   soname_spec='${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
-  shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
   if test "$GCC" = yes; then
     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
@@ -17101,8 +17423,17 @@ kfreebsd*-gnu)
   dynamic_linker='GNU ld.so'
   ;;
 
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[123]*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
@@ -17120,7 +17451,7 @@ freebsd*)
   freebsd2*)
     shlibpath_overrides_runpath=yes
     ;;
-  freebsd3.01* | freebsdelf3.01*)
+  freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
@@ -17147,9 +17478,9 @@ hpux9* | hpux10* | hpux11*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
-  case "$host_cpu" in
+  case $host_cpu in
   ia64*)
-    shrext='.so'
+    shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
@@ -17164,7 +17495,7 @@ hpux9* | hpux10* | hpux11*)
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
    hppa*64*)
-     shrext='.sl'
+     shrext_cmds='.sl'
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
@@ -17175,7 +17506,7 @@ hpux9* | hpux10* | hpux11*)
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
    *)
-    shrext='.sl'
+    shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
@@ -17246,8 +17577,8 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -17259,6 +17590,18 @@ linux*)
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
 knetbsd*-gnu)
   version_type=linux
   need_lib_prefix=no
@@ -17309,7 +17652,11 @@ nto-qnx*)
 openbsd*)
   version_type=sunos
   need_lib_prefix=no
-  need_version=yes
+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
+  case $host_os in
+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
+    *)                         need_version=no  ;;
+  esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
@@ -17329,7 +17676,7 @@ openbsd*)
 
 os2*)
   libname_spec='$name'
-  shrext=".dll"
+  shrext_cmds=".dll"
   need_lib_prefix=no
   library_names_spec='$libname${shared_ext} $libname.a'
   dynamic_linker='OS/2 ld.exe'
@@ -17431,8 +17778,8 @@ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action_GCJ=
 if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
+   test -n "$runpath_var_GCJ" || \
+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
 
   # We can hardcode non-existant directories.
   if test "$hardcode_direct_GCJ" != no &&
@@ -17558,8 +17905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17662,8 +18008,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17728,8 +18073,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17822,8 +18166,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17888,8 +18231,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -17955,8 +18297,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18022,8 +18363,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -18098,7 +18438,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18101 "configure"
+#line 18441 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18164,7 +18504,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
@@ -18196,7 +18536,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18199 "configure"
+#line 18539 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18262,7 +18602,7 @@ EOF
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
+    (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
@@ -18313,7 +18653,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18414,6 +18754,12 @@ fast_install=$enable_fast_install
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18456,7 +18802,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -18475,7 +18821,7 @@ objext="$ac_objext"
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -18490,7 +18836,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -18738,11 +19084,35 @@ LTCC=${LTCC-"$CC"}
 compiler=$CC
 
 
+# save warnings/boilerplate of simple test code
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$rm conftest*
+
+ac_outfile=conftest.$ac_objext
+printf "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$rm conftest*
+
+
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
 compiler_RC=$CC
+for cc_temp in $compiler""; do
+  case $cc_temp in
+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
+    \-*) ;;
+    *) break;;
+  esac
+done
+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
 lt_cv_prog_compiler_c_o_RC=yes
 
 # The else clause should only fire when bootstrapping the
@@ -18758,7 +19128,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
     SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
@@ -18859,6 +19229,12 @@ fast_install=$enable_fast_install
 # The host system.
 host_alias=$host_alias
 host=$host
+host_os=$host_os
+
+# The build system.
+build_alias=$build_alias
+build=$build
+build_os=$build_os
 
 # An echo program that does not interpret backslashes.
 echo=$lt_echo
@@ -18901,7 +19277,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS=$lt_AS
+AS="$AS"
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -18920,7 +19296,7 @@ objext="$ac_objext"
 libext="$libext"
 
 # Shared library suffix (normally ".so").
-shrext='$shrext'
+shrext_cmds='$shrext_cmds'
 
 # Executable file suffix (normally "").
 exeext="$exeext"
@@ -18935,7 +19311,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
 
-# Must we lock files when doing compilation ?
+# Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Do we need the lib prefix for modules?
@@ -20229,8 +20605,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20402,11 +20777,11 @@ else
 fi
 
 
-  succeeded=no
 
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
@@ -20431,7 +20806,6 @@ do
 done
 done
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
@@ -20445,77 +20819,19 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gtk+-2.0" >&5
-echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6
-
-        if $PKG_CONFIG --exists "gtk+-2.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-            succeeded=yes
-
-            echo "$as_me:$LINENO: checking GTK2_CFLAGS" >&5
-echo $ECHO_N "checking GTK2_CFLAGS... $ECHO_C" >&6
-            GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"`
-            echo "$as_me:$LINENO: result: $GTK2_CFLAGS" >&5
-echo "${ECHO_T}$GTK2_CFLAGS" >&6
-
-            echo "$as_me:$LINENO: checking GTK2_LIBS" >&5
-echo $ECHO_N "checking GTK2_LIBS... $ECHO_C" >&6
-            GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"`
-            echo "$as_me:$LINENO: result: $GTK2_LIBS" >&5
-echo "${ECHO_T}$GTK2_LIBS" >&6
-        else
-            GTK2_CFLAGS=""
-            GTK2_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
-
-        fi
-
-
-
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
-
-  if test $succeeded = yes; then
-     HAVE_GTK2=yes
-                   BUILD_LIBGUTENPRINTUI2=yes
-                   GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} ${GTK2_LIBS}"
-  else
-     HAVE_GTK2=no
-	           BUILD_LIBGUTENPRINTUI2=no
-  fi
-
-# Require both gimptool and pkg-config to succeed
-if test x$BUILD_GIMP2 = xyes; then
-
-  succeeded=no
-
-  if test -z "$PKG_CONFIG"; then
-    # Extract the first word of "pkg-config", so it can be a program name with args.
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  case $PKG_CONFIG in
+  case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -20525,79 +20841,190 @@ do
   test -z "$as_dir" && as_dir=.
   for ac_exec_ext in '' $ac_executable_extensions; do
   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
 done
 
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
   ;;
 esac
 fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+if test -n "$ac_pt_PKG_CONFIG"; then
+  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-  fi
-
-  if test "$PKG_CONFIG" = "no" ; then
-     echo "*** The pkg-config script could not be found. Make sure it is"
-     echo "*** in your path, or set the PKG_CONFIG environment variable"
-     echo "*** to the full path to pkg-config."
-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
-  else
-     PKG_CONFIG_MIN_VERSION=0.9.0
-     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:$LINENO: checking for gimpui-2.0" >&5
-echo $ECHO_N "checking for gimpui-2.0... $ECHO_C" >&6
+  PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
 
-        if $PKG_CONFIG --exists "gimpui-2.0" ; then
-            echo "$as_me:$LINENO: result: yes" >&5
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-            succeeded=yes
-
-            echo "$as_me:$LINENO: checking GIMP2_CFLAGS" >&5
-echo $ECHO_N "checking GIMP2_CFLAGS... $ECHO_C" >&6
-            GIMP2_CFLAGS=`$PKG_CONFIG --cflags "gimpui-2.0"`
-            echo "$as_me:$LINENO: result: $GIMP2_CFLAGS" >&5
-echo "${ECHO_T}$GIMP2_CFLAGS" >&6
-
-            echo "$as_me:$LINENO: checking GIMP2_LIBS" >&5
-echo $ECHO_N "checking GIMP2_LIBS... $ECHO_C" >&6
-            GIMP2_LIBS=`$PKG_CONFIG --libs "gimpui-2.0"`
-            echo "$as_me:$LINENO: result: $GIMP2_LIBS" >&5
-echo "${ECHO_T}$GIMP2_LIBS" >&6
-        else
-            GIMP2_CFLAGS=""
-            GIMP2_LIBS=""
-            ## If we have a custom action on failure, don't print errors, but
-            ## do set a variable so people can do so.
-            GIMP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gimpui-2.0"`
+	else
+		echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+		PKG_CONFIG=""
+	fi
+
+fi
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for GTK2" >&5
+echo $ECHO_N "checking for GTK2... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GTK2_CFLAGS"; then
+        pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GTK2_LIBS"; then
+        pkg_cv_GTK2_LIBS="$GTK2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gtk+-2.0") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
 
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0"`
+        else
+	        GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0"`
         fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GTK2_PKG_ERRORS" >&5
 
+	HAVE_GTK2=no
+	           BUILD_LIBGUTENPRINTUI2=no
+elif test $pkg_failed = untried; then
+	HAVE_GTK2=no
+	           BUILD_LIBGUTENPRINTUI2=no
+else
+	GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
+	GTK2_LIBS=$pkg_cv_GTK2_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	HAVE_GTK2=yes
+                   BUILD_LIBGUTENPRINTUI2=yes
+                   GUTENPRINTUI2_LIBDEPS="${GUTENPRINTUI2_LIBDEPS} ${GTK2_LIBS}"
+fi
+# Require both gimptool and pkg-config to succeed
+if test x$BUILD_GIMP2 = xyes; then
 
+pkg_failed=no
+echo "$as_me:$LINENO: checking for GIMP2" >&5
+echo $ECHO_N "checking for GIMP2... $ECHO_C" >&6
 
-     else
-        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
-        echo "*** See http://www.freedesktop.org/software/pkgconfig"
-     fi
-  fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GIMP2_CFLAGS"; then
+        pkg_cv_GIMP2_CFLAGS="$GIMP2_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GIMP2_CFLAGS=`$PKG_CONFIG --cflags "gimpui-2.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$GIMP2_LIBS"; then
+        pkg_cv_GIMP2_LIBS="$GIMP2_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gimpui-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gimpui-2.0") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_GIMP2_LIBS=`$PKG_CONFIG --libs "gimpui-2.0" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
 
-  if test $succeeded = yes; then
-     BUILD_GIMP2=yes
-  else
-     BUILD_GIMP2=no
-  fi
 
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        GIMP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gimpui-2.0"`
+        else
+	        GIMP2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gimpui-2.0"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GIMP2_PKG_ERRORS" >&5
+
+	BUILD_GIMP2=no
+elif test $pkg_failed = untried; then
+	BUILD_GIMP2=no
+else
+	GIMP2_CFLAGS=$pkg_cv_GIMP2_CFLAGS
+	GIMP2_LIBS=$pkg_cv_GIMP2_LIBS
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	BUILD_GIMP2=yes
+fi
 fi
 
 # create custom command-line --with option
@@ -20899,8 +21326,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -20954,8 +21380,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21394,8 +21819,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21453,8 +21877,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21570,8 +21993,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21625,8 +22047,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21671,8 +22092,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21716,8 +22136,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -21756,115 +22175,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -22232,8 +22542,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22291,8 +22600,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22408,8 +22716,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22463,8 +22770,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22509,8 +22815,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22554,8 +22859,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22594,115 +22898,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
 
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 
@@ -22877,8 +23072,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -22944,8 +23138,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -23034,8 +23227,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24497,8 +24689,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24589,8 +24780,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -24640,8 +24830,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25107,8 +25296,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25162,8 +25350,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25384,8 +25571,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25445,8 +25631,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25506,8 +25691,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25566,8 +25750,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25628,8 +25811,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25701,8 +25883,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25780,8 +25961,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25859,8 +26039,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -25938,8 +26117,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26024,8 +26202,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26115,8 +26292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26184,8 +26360,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26253,8 +26428,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26323,8 +26497,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26392,8 +26565,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26515,8 +26687,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26586,8 +26757,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26650,8 +26820,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26804,8 +26973,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26882,8 +27050,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -26955,8 +27122,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27265,8 +27431,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27585,8 +27750,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -27900,8 +28064,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28236,8 +28399,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28351,8 +28513,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28518,8 +28679,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28664,8 +28824,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28822,8 +28981,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -28972,8 +29130,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29122,8 +29279,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29272,8 +29428,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29422,8 +29577,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29574,8 +29728,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29725,8 +29878,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -29875,8 +30027,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30025,8 +30176,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30217,8 +30367,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30278,8 +30427,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30352,8 +30500,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30418,8 +30565,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30491,8 +30637,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30593,8 +30738,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -30691,8 +30835,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -31111,7 +31254,7 @@ cat >>confdefs.h <<_ACEOF
 #define CUPS_PPD_PS_LEVEL ${CUPS_PPD_PS_LEVEL}
 _ACEOF
 
-RELEASE_DATE="27 Aug 2005"
+RELEASE_DATE="22 Nov 2005"
 
 cat >>confdefs.h <<_ACEOF
 #define RELEASE_DATE "${RELEASE_DATE}"
@@ -31178,8 +31321,6 @@ gutenprintui2_libs="${GUTENPRINTUI2_LIBS} ${gutenprintui2_libdeps}"
 
           ac_config_files="$ac_config_files doc/developer/Makefile"
 
-          ac_config_files="$ac_config_files doc/users_guide/Makefile"
-
           ac_config_files="$ac_config_files include/Makefile"
 
           ac_config_files="$ac_config_files include/gutenprint/Makefile"
@@ -31344,27 +31485,6 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -31372,20 +31492,6 @@ echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${BUILD_FOOMATIC_TRUE}" && test -z "${BUILD_FOOMATIC_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"BUILD_FOOMATIC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -31801,7 +31907,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by gutenprint $as_me 5.0.0-rc1, which was
+This file was extended by gutenprint $as_me 5.0.0-rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31864,7 +31970,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-gutenprint config.status 5.0.0-rc1
+gutenprint config.status 5.0.0-rc2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -31963,7 +32069,6 @@ cat >>$CONFIG_STATUS <<_ACEOF
 # INIT-COMMANDS section.
 #
 
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
     # from automake.
@@ -31988,7 +32093,6 @@ do
   "doc/gutenprint.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprint.dox" ;;
   "doc/gutenprintui2.dox" ) CONFIG_FILES="$CONFIG_FILES doc/gutenprintui2.dox" ;;
   "doc/developer/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/developer/Makefile" ;;
-  "doc/users_guide/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/users_guide/Makefile" ;;
   "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
   "include/gutenprint/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprint/Makefile" ;;
   "include/gutenprintui/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/gutenprintui/Makefile" ;;
@@ -32024,7 +32128,6 @@ do
   "cups-gutenprint.list" ) CONFIG_FILES="$CONFIG_FILES cups-gutenprint.list" ;;
   "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
   "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
@@ -32164,15 +32267,6 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@ac_ct_CC@,$ac_ct_CC,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
 s,@EGREP@,$EGREP,;t t
 s,@LN_S@,$LN_S,;t t
 s,@ECHO@,$ECHO,;t t
@@ -32184,9 +32278,6 @@ s,@CPP@,$CPP,;t t
 s,@CXX@,$CXX,;t t
 s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
 s,@CXXCPP@,$CXXCPP,;t t
 s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
@@ -32206,6 +32297,7 @@ s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
 s,@GTK_LIBS@,$GTK_LIBS,;t t
 s,@GIMPTOOL2_CHECK@,$GIMPTOOL2_CHECK,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@GTK2_CFLAGS@,$GTK2_CFLAGS,;t t
 s,@GTK2_LIBS@,$GTK2_LIBS,;t t
 s,@GIMP2_CFLAGS@,$GIMP2_CFLAGS,;t t
@@ -32496,11 +32588,6 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -32539,6 +32626,12 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
@@ -32938,91 +33031,6 @@ esac
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
 echo "$as_me: executing $ac_dest commands" >&6;}
   case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
     default-1 )
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
diff --git a/configure.ac b/configure.ac
index f755b51..80b8ebb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac,v 1.130 2005/08/11 03:10:18 rlk Exp $
+dnl $Id: configure.ac,v 1.131 2005/11/21 11:16:22 rleigh Exp $
 dnl Copyright (C) 2001-2004 Roger Leigh
 dnl 
 dnl This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ pushdef([GUTENPRINT_NAME],              [gutenprint])
 pushdef([GUTENPRINT_MAJOR_VERSION],     [5])
 pushdef([GUTENPRINT_MINOR_VERSION],     [0])
 pushdef([GUTENPRINT_MICRO_VERSION],     [0])
-pushdef([GUTENPRINT_EXTRA_VERSION],     [-rc1])
+pushdef([GUTENPRINT_EXTRA_VERSION],     [-rc2])
 pushdef([GUTENPRINT_CURRENT_INTERFACE], [2])
 pushdef([GUTENPRINT_INTERFACE_AGE],     [0])
 pushdef([GUTENPRINT_BINARY_AGE],        [0])
@@ -52,7 +52,7 @@ pushdef([GUTENPRINT_VERSION], GUTENPRINT_MAJOR_VERSION.GUTENPRINT_MINOR_VERSION.
 
 AC_INIT(GUTENPRINT_NAME, GUTENPRINT_VERSION, [gimp-print-devel@lists.sourceforge.net])
 AC_PREREQ(2.53)
-AC_REVISION($Revision: 1.130 $)
+AC_REVISION($Revision: 1.131 $)
 AC_CONFIG_SRCDIR(src/main/print-vars.c)
 AC_CONFIG_AUX_DIR(scripts)
 STP_INIT
@@ -117,7 +117,7 @@ AC_SUBST([GUTENPRINTUI2_INTERFACE_AGE])
 AC_SUBST([GUTENPRINTUI2_BINARY_AGE])
 
 dnl Initialize automake stuff.
-AM_INIT_AUTOMAKE(GUTENPRINT_NAME, GUTENPRINT_VERSION)
+AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-dist-gzip tar-ustar check-news gnu no-dependencies)
 popdef([GUTENPRINT_NAME])
 popdef([GUTENPRINT_VERSION])
 
@@ -916,7 +916,6 @@ AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([doc/gutenprint.dox])
 AC_CONFIG_FILES([doc/gutenprintui2.dox])
 AC_CONFIG_FILES([doc/developer/Makefile])
-AC_CONFIG_FILES([doc/users_guide/Makefile])
 AC_CONFIG_FILES([include/Makefile])
 AC_CONFIG_FILES([include/gutenprint/Makefile])
 AC_CONFIG_FILES([include/gutenprintui/Makefile])
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..cc24b31
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,23 @@
+Gutenprint for Debian
+---------------------
+
+This is Gutenprint version 5.0.0-rc1, a beta release in the 5.0
+series.  Gutenprint is the print facility for the GIMP, and in
+addition a suite of drivers that may be used with common UNIX spooling
+systems using Ghostscript or CUPS.  These drivers provide printing
+quality for UNIX/Linux on a par with proprietary vendor-supplied
+drivers in many cases, and can be used for many of the most demanding
+printing tasks.
+
+A complete list of supported printers may be found in the NEWS file.
+On Debian GNU/Linux, the NEWS file is called `changelog.gz'.
+
+Documentation can be found in the gutenprint-doc package, which covers
+the use of libgutenprint-based programs, and the libgutenprint-doc
+package, which covers developing programs using libgutenprint.
+
+Gutenprint was previously known as Gimp-Print.  The name was changed
+for the 5.0 release.
+
+
+ -- Roger Leigh <rleigh@debian.org>,  Tue, 02 Aug 2005 19:30:56 +0100
diff --git a/debian/README.building b/debian/README.building
new file mode 100644
index 0000000..c0cad80
--- /dev/null
+++ b/debian/README.building
@@ -0,0 +1,78 @@
+Building the gutenprint Debian packages	                 -*- mode: text -*-
+=======================================
+
+
+Prerequisites
+-------------
+
+The packages that must be installed to build the gutenprint packages
+are listed in the Build-Depends field of the control file
+debian/control[.in].  However, these are the prerequisites to build
+the Debianised source.  Other packages may be needed if building
+directly from CVS; it is less likely other tools will be needed if
+building from a distributed tarball.  Other tools that might
+potentially be needed are the latest versions of gettext, texi2html,
+docbook-utils and imagemagick.  build-essential and devscripts should
+also be installed in order to build Debian packages.
+
+# apt-get build-dep gutenprint
+
+should do this automatically, if the gutenprint sources are available
+in your APT sources.list.
+
+
+Getting the source
+------------------
+
+Since 5.0.0 (and its prereleases), building from upstream CVS or
+the release tarball is no longer supported (and in fact, not even
+possible).  The Debian packaging is only provided in the Debian
+diff.
+
+To get the source, run
+
+$ apt-get source gutenprint
+
+or download it from your nearest Debian mirror.
+
+
+Making changes
+--------------
+
+If needed, modify debian/changelog to change the version
+numbering. The version number should be the same as the package
+version number, followed by a hyphen and a Debian package revision
+number e.g. 4.2.0-1 for release 4.2.0, Debian revision 1.  Run
+
+$ debian/rules debian/control
+
+after changing the version number, to ensure the control file is
+up-to-date.
+
+
+If any source changes are required, please use dpatch, and place
+the patch under debian/patches.  Once you have created a diff,
+create a dpatch as follows:
+
+dpatch patch-template -p '0n_patch_name' "Patch description" \
+< mypatch.diff > debian/patches/0n_patch_name.dpatch
+
+and add "0n_patch_name.dpatch" to debian/patches/00list
+
+
+Building
+--------
+
+To build the packages:
+
+$ dpkg-buildpackage -rfakeroot -us -uc
+or
+$ debuild -us -uc -L -i
+
+It should build without problems on Debian 3.1 (sarge) and unstable,
+but will no longer build on Debian 3.0 (woody) and earlier distributions.
+
+
+I hope you like it!
+
+Roger Leigh <rleigh@debian.org> -- Sun, 14 Aug 2005 13:11:35 +0100
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..69a8843
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,670 @@
+gutenprint (4.3.99+cvs20051122-1) experimental; urgency=low
+
+  * New upstream CVS snapshot (Closes: #340155).
+  * The GFDL licensed user's guide has been removed from the
+    upstream tarball to create a DFSG-free .orig.tar.gz.
+  * Several Epson Stylus Photo printers have been retuned since the
+    last version (Closes: #335789).
+  * The Epson Stylus C88 is now supported (Closes: #338961).
+  * debian/control.in:
+    - Improve the ijsgutenprint package description (Closes: #337845).
+    - Remove 'Suggests: gutenprint-doc (>= ${Source-Version})' from
+      gimp-print and cupsys-driver-gutenprint.
+    - Remove the gutenprint-doc package, which was GFDL licensed.
+      The control data is kept in debian/control.gfdl.
+
+ -- Roger Leigh <rleigh@debian.org>  Tue, 22 Nov 2005 15:00:23 +0000
+
+gutenprint (4.3.99+cvs20050901-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * Drop patches which have been incorporated upstream:
+    - 01_cups_genppdupdate_filename_metacharacters.dpatch
+    - 02_escp2_r800_papers.dpatch
+    - 03_escp2_colour_adjust_segfault.dpatch
+    - 04_print_settings_corruption.dpatch
+  * debian/control:
+    - cupsys-driver-gutenprint: Drop libperlmenu-perl dependency.
+    - gimp-print: Add an "Enhances: gimp" to reinforce the fact this is a
+      useful part of gimp (Closes: #322066).  This does not entirely fix the
+      upgrade issues, but without a strict dependency in gimp (which the
+      author does not want), this is the best that can be done.
+  * src/cups/cups-genppdconfig.in: Remove support for perlmenu in favour
+    of dialog(1).  This prevents a number of warnings on startup, and also
+    removes a lot of dead code (Closes: #323450).  Applied as
+    05_genppdconfig_remove_perlmenu.dpatch.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat,  3 Sep 2005 20:46:06 +0100
+
+gutenprint (4.3.99+cvs20050813-2) unstable; urgency=low
+
+  * src/main/print-canon.c: Change "Plain PIXMA" paper name to
+    "PlainPIXMA" in order to avoid illegal whitespace in
+    generated PPD files (Closes: #322397).
+
+ -- Roger Leigh <rleigh@debian.org>  Wed, 31 Aug 2005 21:16:10 +0100
+
+gutenprint (4.3.99+cvs20050813-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * src/cups/cups-genppdconfig.in: drop Locale::gettext patch,
+    which is now incorporated upstream.
+  * debian/control.in, debian/rules: Use dpatch.
+  * Added cups-genppdupdate patch as
+    01_cups_genppdupdate_filename_metacharacters.dpatch
+  * Don't segfault when using certain paper types with an Epson R800.
+    Applied patch from Dan Torop as 02_escp2_r800_papers.dpatch
+    and 03_escp2_colour_adjust_segfault.dpatch (Closes: #321603).
+  * Don't corrupt print settings under certain conditions, due to
+    using uninitialised global variables.  Applied patch from upstream
+    based on a patch contributed by Dan Torop as
+    04_print_settings_corruption.dpatch (Closes: #321599).
+  * debian/debian/cupsys-driver-gutenprint.postinst: Remove bashisms.
+
+ -- Roger Leigh <rleigh@debian.org>  Sun, 14 Aug 2005 22:20:52 +0100
+
+gutenprint (4.3.99+cvs20050801-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * src/cups/cups-genppdconfig.in: Remove "use Locale::gettext" to
+    drop missing dependency on liblocale-gettext-perl
+    (Closes: #320745).
+
+ -- Roger Leigh <rleigh@debian.org>  Tue,  2 Aug 2005 21:06:08 +0100
+
+gutenprint (4.3.99+cvs20050715-4) unstable; urgency=low
+
+  * debian/rules: Correct the names of the ijsgutenprint
+    symlinks.
+
+ -- Roger Leigh <rleigh@debian.org>  Thu, 28 Jul 2005 23:19:35 +0100
+
+gutenprint (4.3.99+cvs20050715-3) unstable; urgency=low
+
+  * src/cups/cups-genppdupdate.in: Apply patch to handle shell
+    metacharacters in PPD filenames, to fix a regression from
+    cupsys-driver-gimpprint (Closes: #319109).
+  * debian/control.in: Add foomatic-db-gimp-print as a
+    transitional package to ease upgrades.
+  * debian/rules: ijsgutenprint symlinks should not be relative
+    to the build directory (Closes: #319416).
+
+ -- Roger Leigh <rleigh@debian.org>  Thu, 28 Jul 2005 21:14:31 +0100
+
+gutenprint (4.3.99+cvs20050715-2) unstable; urgency=low
+
+  * debian/control.in:
+    - ijsgimpprint depends on ijsgutenprint, not
+      cupsys-driver-gutenprint (Closes: #318911).
+    - ijsgimpprint is in section text, not graphics
+      (correction of override disparity).
+
+ -- Roger Leigh <rleigh@debian.org>  Mon, 18 Jul 2005 18:39:47 +0100
+
+gutenprint (4.3.99+cvs20050715-1) unstable; urgency=low
+
+  * New upstream release candidate.
+  * debian/control.in: Change Maintainer to Debian Printing Group
+    <debian-printing@lists.debian.org>.
+  * debian/rules: Don't build translated PPDs.  They may be generated
+    after installation by the user.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat, 16 Jul 2005 22:45:28 +0100
+
+gutenprint (4.3.99+cvs20050702-1) experimental; urgency=low
+
+  * New upstream release candidate (Closes: #293890).
+  * Renamed package to gutenprint.  The following packages were
+    renamed in consequence:
+    - cupsys-driver-gimpprint renamed to cupsys-driver-gutenprint
+    - foomatic-db-gimp-print renamed to foomatic-db-gutenprint
+    - gimpprint-doc renamed to gutenprint-doc
+    - gimpprint-locales renamed to gutenprint-locales
+    - ijsgimpprint renamed to ijsgutenprint
+    - libgimpprint renamed to libgutenprint
+    - libgimpprint-dev renamed to libgutenprint-dev
+    - libgimpprint-doc renamed to libgutenprint-doc
+  * New packages:
+    - libgimpprintui1-1 (GTK+ 1.2 UI library)
+    - libgimpprintui1-dev (GTK+ 1.2 UI library headers)
+    - libgimpprintui2-1 (GTK+ 2.0 UI library)
+    - libgimpprintui2-dev (GTK+ 2.0 UI library headers)
+  * Upgrade to Standards-Version 3.6.2
+  * Build-Depends:
+    - replace libreadline4-dev with libreadline5-dev
+    - add libcupsimage2-dev
+    - remove libtool
+  * debian/rules: add LIBRARYUI_VERSION, required to support
+    separate sonames for libgutenprint and libgutenprintui*.
+  * cupsys-driver-gutenprint:
+    - add cups-genppdupdate
+    - generates the PPDs in postinst, and removes them in prerm
+    - use new versioned CUPS executables
+  * libgutenprint: add modules and XML data.
+  * libgutenprint-doc:
+    - fix documentation installation for new API reference and
+      developer's reference.
+    - distribute gutenprint.pdf; gutenprint.ps is no longer created.
+  * Remove old and outdated manual pages.
+  * Provide versioned ijsgutenprint manual page, and unversioned
+    symlinks for the binary and manpage.
+  * Create a dummy cupsys-driver-gimpprint package to enable
+    upgrades from stable.
+  * Create a dummy ijsgimpprint package to enable upgrades from stable.
+  * Remove symlinks in debian directory.
+  * Don't autogenerate files in debian directory for anything but the
+    libgutenprintui package.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat,  2 Jul 2005 10:12:46 +0100
+
+gimp-print (4.2.7-10) unstable; urgency=high
+
+  * cupsys-driver-gimpprint: Depend on a perl >= 5.8.0, otherwise
+    upgrades from woody may fail due to /usr/bin/cups-genppdupdate
+    using features only available in perl 5.8 (Closes: #307286).
+  * Build-Depend on libreadline5-dev, rather than the old
+    libreadline4-dev.
+
+ -- Roger Leigh <rleigh@debian.org>  Mon,  2 May 2005 14:58:39 +0100
+
+gimp-print (4.2.7-9) unstable; urgency=low
+
+  * debian/cups-genppdupdate: Fix grepping of PPDs to work with PPD
+    file names with shell metacharacters in them.  Patch from Martin
+    Pitt (Closes: #302434).
+
+ -- Roger Leigh <rleigh@debian.org>  Thu, 31 Mar 2005 22:10:41 +0100
+
+gimp-print (4.2.7-8) unstable; urgency=low
+
+  * cupsys-driver-gimpprint: Depend on cupsys >= 1.1.23 to ensure
+    that /etc/init.d/cupsys supports the force-reload option.
+    Some older versions of cupsys did not, and this causes
+    package configuration to fail when restarting cupsys.
+    (Closes: #300966)
+
+ -- Roger Leigh <rleigh@debian.org>  Wed, 23 Mar 2005 18:06:35 +0000
+
+gimp-print (4.2.7-7) unstable; urgency=low
+
+  * debian/control.in:
+    - Prefer gs-esp as gs interpreter.  Patch from Colin Watson.
+    - Recommend gnome-gv as default postscript-viewer.  Patch
+      from Sebastien Bacher.
+
+ -- Roger Leigh <rleigh@debian.org>  Tue, 22 Mar 2005 00:20:09 +0000
+
+gimp-print (4.2.7-6) unstable; urgency=low
+
+  * Allow A4 printing on HP DesignJet printers.  Patch from
+    Klaus Singvogel.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat, 19 Mar 2005 09:58:18 +0000
+
+gimp-print (4.2.7-5) unstable; urgency=low
+
+  * Patch src/cups/Makefile.in so that genppd will use the "C"
+    locale when generating PPDs, not the locale of the build
+    system.  This will prevent wrongly UTF-8 encoded "ISOLatin1"
+    PPDs being generated (Closes: #293178).
+  * ijsgimpprint: Conditionally depend upon gs-afpl instead of
+    gs-aladdin, which it replaces (Closes: #293384).
+
+ -- Roger Leigh <rleigh@debian.org>  Wed,  2 Feb 2005 21:45:16 +0000
+
+gimp-print (4.2.7-4) unstable; urgency=low
+
+  * cupsys-driver-gimpprint: Use "force-reload" rather than
+    "reload" in postinst and postrm (Closes: #274820).  Reported
+    by Martin Pitt.
+  * Applied GNU/k*BSD patch from Robert Millan (Closes: #263763).
+
+ -- Roger Leigh <rleigh@debian.org>  Tue,  5 Oct 2004 19:46:08 +0100
+
+gimp-print (4.2.7-3) unstable; urgency=low
+
+  * foomatic-db-gimp-print: ensure all files are UTF-8 encoded
+    by building the package in a UTF-8 locale (en_GB.UTF-8).
+    Thanks to Chris Lawrence for finding this problem.
+
+ -- Roger Leigh <rleigh@debian.org>  Tue, 21 Sep 2004 21:37:38 +0100
+
+gimp-print (4.2.7-2) unstable; urgency=medium
+
+  * Medium urgency to facilitate the libtiff transition.
+  * cupsys-driver-gimpprint:
+      - Link explicitly with -lcupsimage, rather than
+        `cups-config --image --libs`.  This prevents unnecessary
+        libpng, libjpeg and libtiff dependencies.  The cups-config
+        logic in configure is overridden.  Thanks to Steve Langasek
+        for this patch (Closes: #262852).
+      - Backport some PPD generation logic from current Gimp-Print
+        CVS, and use the new PPD keywords in cups-genppdupdate.
+        The PPD PCFileName keyword was made compliant with the PPD
+        standard with version 4.2.6 (read: crippled to an 8.3 DOS
+        filename) which broke the upgrade script since the full PPD
+        name could no longer be encoded.  The new Gimp-Print specific
+        keywords *StpDriverName, *StpPPDLocation and *StpLocale have
+        been added to the PPDs, and this information is now used to
+        correctly upgrade PPDs (Closes: #260072).
+  * debian/rules: Don't enable maintainer-mode when running
+    configure.
+
+ -- Roger Leigh <rleigh@debian.org>  Tue,  3 Aug 2004 19:23:19 +0100
+
+gimp-print (4.2.7-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * Dropped patches for:
+      - missing strdup prototype in AM_PATH_GIMPPRINT (#233971).
+      - fixing garbage output when files generated with psnup are
+        printed (#175970).
+      - correct margin definitions for Epson Stylus C63, C64, C83
+        and C84.
+    All of these patches have been incorporated into the new
+    release.
+  * Update to Standards-Version 3.6.1.
+  * cupsys-driver-gimpprint: update Recommends to depend upon the
+    current gs package names, and put the virtual package
+    postscript-viewer as the last alternative, rather than the
+    first.
+  * cupsys-driver-gimpprint: patched src/cups/Makefile.am to
+    disable linking rastertoprinter with a static libgimpprint.
+
+ -- Roger Leigh <rleigh@debian.org>  Sat, 17 Jul 2004 17:38:35 +0100
+
+gimp-print (4.2.6-7) unstable; urgency=high
+
+  * Reupload with high urgency to shorten libcupsys2-gnutls10
+    transition waiting time.
+
+ -- Roger Leigh <rleigh@debian.org>  Fri,  9 Jul 2004 11:56:34 +0100
+
+gimp-print (4.2.6-6) unstable; urgency=low
+
+  * cupsys-driver-gimpprint-data depends on cupsys-driver-gimpprint.
+
+ -- Roger Leigh <rleigh@debian.org>  Wed,  7 Jul 2004 13:26:51 +0100
+
+gimp-print (4.2.6-5) unstable; urgency=medium
+
+  * NMU.
+  * Rebuild against libcupsys2-gnutls10.
+
+ -- Kenshi Muto <kmuto@debian.org>  Thu, 27 May 2004 16:39:55 +0000
+
+gimp-print (4.2.6-4) unstable; urgency=low
+
+  * Split architecture-independent data in cupsys-driver-gimpprint
+    into a separate arch-all cupsys-driver-gimpprint-data package
+    which cupsys-driver-gimpprint depends upon (Closes: #233338).
+  * Add missing strdup prototype in AM_PATH_GIMPPRINT in
+    gimpprint.m4.  This prevents configure scripts using this macro
+    from segfaulting on ia64 (Closes: #233971).
+  * Correct margin definitions for Epson Stylus C63, C64, C83 and
+    C84.  This is a temporary fix until the margins have been
+    correctly computed.
+  * Build-Depend upon libijs-dev (>= 0.35-1) to ensure that
+    ijsgimpprint is built against the current libijs
+    (Closes: #237561).
+
+ -- Roger Leigh <rleigh@debian.org>  Fri, 12 Mar 2004 20:32:51 +0000
+
+gimp-print (4.2.6-3) unstable; urgency=low
+
+  * Rebuild against new Foomatic packages.  This should hopefully
+    fix autobuilding problems with older Foomatic releases (which
+    wouldn't autoconfigure on the buildd).
+
+ -- Roger Leigh <rleigh@debian.org>  Mon,  1 Mar 2004 13:07:07 +0000
+
+gimp-print (4.2.6-2) unstable; urgency=low
+
+  * Fix garbage output when files generated with psnup are printed.
+    The output quality will be degraded, and warnings will be
+    logged, since the job options have been broken.  This is
+    because psnup generates non-ADSC compliant PostScript which
+    makes pstops output incorrect job options.  Patch from
+    Martin Kögler (Closes: #175970).
+
+ -- Roger Leigh <rleigh@debian.org>  Tue, 10 Feb 2004 19:39:17 +0000
+
+gimp-print (4.2.6-1) unstable; urgency=low
+
+  * New upstream stable release.
+  * cupsys-driver-gimpprint: cups-genppdupdate should escape
+    metacharacters in queue names.  quotemeta fix from David
+    Beaumont (Closes: #223081).
+  * A locale issue which resulted in buggy PostScript output
+    with some locales has been fixed (Closes: #221662).
+  * CUPS PPD files moved from /usr/share/cups/model/gimp-print
+    to /usr/share/cups/model/gimp-print/4.2.  This is the
+    5.0 naming scheme, and will allow 4.2 and 5.0 to
+    coexist.  cups-genppdupdate uses the new scheme.
+
+ -- Roger Leigh <rleigh@debian.org>  Tue, 13 Jan 2004 23:42:02 +0000
+
+gimp-print (4.2.5-6) unstable; urgency=low
+
+  * Change Recommends on gimpprint-locales to Suggests (Closes: #212302).
+  * cupsys-driver-gimpprint postrm should not reload cupsys if it
+    has already been removed (Closes: #217295).
+
+ -- Roger Leigh <rleigh@debian.org>  Sun, 26 Oct 2003 23:10:31 +0000
+
+gimp-print (4.2.5-5) unstable; urgency=low
+
+  * Clean up package descriptions in debian/control.in.
+  * Don't depend on essential package gzip.
+
+ -- Roger Leigh <rleigh@debian.org>  Sun,  7 Sep 2003 23:04:56 +0100
+
+gimp-print (4.2.5-4) unstable; urgency=low
+
+  * Fix the use of an unintialised value in cups-genppdupdate
+    (Closes: #193501).
+  * cups-genppdupdate no longer prints an error when there are no PPD files
+    available (use Perl glob() instead of shell globbing).
+  * Update cups-genppdupdate using the latest upstream CVS version.
+  * Replace cupsys-driver-gimpprint dependency on libcompress-zlib-perl, with
+    a gzip dependency (gunzip replaces Compress::Zlib in cups-genppdupdate).
+  * Update for Foomatic 3.0:
+      - Update foomatic-db-gimp-print description (sync with foomatic-db).
+      - Build-Depend on foomatic-db-engine (foomatic-bin is deprecated).
+      - Update foomatic-db-gimp-print dependencies (correctly depend on the
+        new foomatic packages and conflict with the old packages).
+      - Run configure with --with-foomatic3
+  * Include escputil fix from 4.2.6 prerelease to fix intermittent hanging
+    reads from printer (Closes: #156228).
+  * Audit all manual pages to ensure correct use of hyphens and minus signs,
+    required for copy and paste in a unicode locale (Closes: #203930).
+  * gimp1.2-print has been removed now the gimp package provides an up-to-date
+    version of the Print plugin.
+  * Updated debian/copyright to include the GFDL-licensed User's Guide.
+
+ -- Roger Leigh <rleigh@debian.org>  Mon, 25 Aug 2003 19:12:24 +0100
+
+gimp-print (4.2.5-3) unstable; urgency=low
+
+  * Build-Depend on libcupsimage2-dev (Closes: #189093).
+  * Remove automake, autoconf, libtool, and bison from
+    Build-Depends, since they are not strictly required.
+  * Remove docbook-utils, texi2html and imagemagick from Build-Depends,
+    since the documentation is pre-generated in the upstream tarball.
+  * Change my maintainer email address to <rleigh@debian.org>.
+  * Move libgimpprint1-dev to section libdevel.
+
+ -- Roger Leigh <rleigh@debian.org>  Wed, 23 Apr 2003 12:57:58 +0100
+
+gimp-print (4.2.5-2) unstable; urgency=low
+
+  * cupsys-driver-gimpprint: cups-genppdupdate will not die if grep exits with
+    a nonzero status (for example, there are no Gimp-Print PPDs in use).
+    (Closes: #179137)
+  * cupsys-driver-gimpprint: Depend on libcompress-zlib-perl, since dh_perl
+    doesn't compute module dependencies.
+    (Closes: #179120, #179170, #179171, #179203)
+
+ -- Roger Leigh <roger@whinlatter.uklinux.net>  Fri, 31 Jan 2003 23:26:51 +0000
+
+gimp-print (4.2.5-1) unstable; urgency=low
+
+  * New stable release
+  * Update for Standards-Version 3.5.7
+  * Use debian/build and debian/install instead of debian/gimp-print-build
+    and debian/gimp-print-install, respectively.
+  * Use dh_install rather than dh_movefiles.  This makes debian/rules
+    slightly cleaner, and debian/install is unchanged after install.
+  * Create symlinks for HTML manuals, since different versions
+    of texi2html and db2html create different names.
+  * Make the dependencies sane (remove incorrect dependencies, and correct
+    dubious ones).  foomatic-db-gimp-print now depends only upon foomatic-db
+    and ijsgimpprint.
+  * escputil has been changed to section "utils", and the override changed
+    (Closes: #145094).
+  * Gimp-Print PPDs are automatically upgraded using a new tool,
+    cups-genppdupdate, which will prevent the in-use PPDs mismatching with
+    the libgimpprint version in use (Closes: #172116).
+  * The Epson stc640 will now print in greyscale and black and white at
+    resolutions >= 720 DPI (Closes: #170473).
+  * The CUPS epson backend uses non-blocking I/O, and so will not hang with
+    some models when no status readback data is sent.
+
+ -- Roger Leigh <roger@whinlatter.uklinux.net>  Wed, 29 Jan 2003 11:37:49 +0000
+
+gimp-print (4.2.4-1) unstable; urgency=low
+
+  * New stable release.
+  * foomatic-db-gimp-print: removed "stp" data, to start the transition
+    to using ijsgimpprint only.
+  * The escputil manual page documents the needed kernel configuration
+    options (Closes: #139000).
+  * The gimpprint-doc package includes the following manual pages:
+      gimpprint-color.7, gimpprint-dithers.7, gimpprint-imagetypes.7
+      gimpprint-inktypes.7, gimpprint-mediasizes.7
+      gimpprint-mediasources.7, gimpprint-mediatypes.7
+      gimpprint-models.7, gimpprint-resolutions.7
+    This documents all the features of gimp-print, in particular all of the
+    details from src/ghost/README (Closes: #113075).
+  * Magenta and cyan are no longer swapped on some Lexmark printers
+    (Closes: #166815).
+
+ -- Roger Leigh <roger@whinlatter.uklinux.net>  Tue, 26 Nov 2002 20:54:30 +0000
+
+gimp-print (4.2.3-2) unstable; urgency=low
+
+  * Use libtool 1.4.3 instead of the release version, to correctly support
+    shared libraries on some architectures.  Closes #168901
+  * escputil is now in section "utils".  Closes #145094
+
+ -- Roger Leigh <roger@whinlatter.uklinux.net>  Tue, 19 Nov 2002 20:55:01 +0000
+
+gimp-print (4.2.3-1) unstable; urgency=low
+
+  * New stable release.
+  * Fixed doc-base problems in libgimpprint-doc.  The doc-base file is
+    generated with sed to insert the version number, Closes #149847
+  * libgimpprint$(VERSION)-doc provides and conflicts with a virtual
+    package libgimpprint-doc to prevent clashes with gimpprint.info
+    docs.
+  * New package ijsgimpprint.  This provides an IJS server for use
+    with ghostscript.
+  * Remove the autotools, texi2html, imagemagick and docbook-utils from the
+    Build-Depends.
+  * Put config.sub and config.guess into scripts/ and clean
+    libgimpprint-doc.doc-base
+  * I am the new maintainer of gimp-print for Debian.
+
+ -- Roger Leigh <roger@whinlatter.uklinux.net>  Sun, 20 Oct 2002 22:10:17 +0100
+
+gimp-print (4.2.2-pre2-1) unstable; urgency=low
+
+  * New stable release, Closes: #148737
+  * Upgrade to debhelper version 4 (RL)
+  * Automate library versioning to work for stable and unstable series.
+    LIBRARY_VERSION is the library major version or -UPSTREAM_VERSION (RL)
+  * Update configure regeneration to work with configure.ac (RL)
+  * libgimpprint$(VERSION)-dev provides and conflicts with a virtual
+    package `libgimpprint-dev' (RL)
+  * Remove libgimpprint.postinst as ldconfig is called by debhelper (RL)
+  * Update package descriptions (RL)
+
+ -- Eric Sharkey <sharkey@debian.org>  Thu,  6 Jun 2002 15:35:28 -0400
+
+gimp-print (4.2.2-pre1-1) unstable; urgency=low
+
+  * New upstream release, Closes: #147404, #139218
+  * Move escputil to section utils (RL)
+  * Add postscript-viewer virtual package as an alternative to gs Recommends
+    for cupsys-driver-gimpprint (RL)
+  * Reinitialise cupsys after installation or removal of
+    cupsys-driver-gimpprint (RL)
+  * Correctly version libgimpprint1 shlibs with -V dh_makeshlibs option
+  * Fix libgimpprint.postinst to use 'if' instead of 'case', removing a
+    lintian warning. (RL)
+  * Split out the message catalogues from the libgimpprint package into
+    a new gimpprint-locales package to avoid filename conflicts when
+    multiple libgimpprint versions are installed concurrently. (RL)
+  * Add libgimpprint-doc.doc-base (existed for six months, but was never
+    added to CVS!) (RL)
+  * New package foomatic-db-gimpprint.  Contains foomatic data (RL)
+
+ -- Eric Sharkey <sharkey@debian.org>  Sat, 25 May 2002 14:20:17 -0400
+
+gimp-print (4.2.0-4) unstable; urgency=low
+
+  * Apply Roger's user's guide Makefile.am patch, Closes: #128421
+  * Work around bug #130756 by building docs with EPS1 figures.
+
+ -- Eric Sharkey <sharkey@debian.org>  Sat, 16 Feb 2002 22:46:29 -0500
+
+gimp-print (4.2.0-3) unstable; urgency=low
+
+  * Fix locales package description, Closes: #123796
+  * Change conflicts to replaces, Closes: #123811
+
+ -- Eric Sharkey <sharkey@debian.org>  Mon, 31 Dec 2001 12:02:42 -0500
+
+gimp-print (4.2.0-2) unstable; urgency=low
+
+  * Fix build dependencies, Closes: #121597
+  * Fix broken gimpprint-doc.doc-base pointing to old index filename
+  * Fix libgimpprint.postinst to use 'if' instead of 'case', removing a
+    lintian warning. (Roger Leigh)
+  * Split out the message catalogues from the libgimpprint package into
+    a new gimpprint-locales package to avoid filename conflicts when
+    multiple libgimpprint versions are installed concurrently. (RL)
+  * Add libgimpprint-doc.doc-base (existed for six months, but was never
+    added to CVS!) (RL)
+
+ -- Eric Sharkey <sharkey@debian.org>  Sun,  9 Dec 2001 09:47:05 -0500
+
+gimp-print (4.2.0-1) unstable; urgency=low
+
+  * New upstream release
+  * cupsys-driver-gimpprint only includes the basic `C' POSIX locale
+    ppd files due to the size of the ppd files (Roger Leigh)
+  * New package gimpprint-doc contains the new user guide. (RL)
+  * Enable i18n (RL)
+  * Add Build-Depends for gettext (>= 0.10.36-1), because
+    'make install' fails with earlier versions due to absent
+    DESTDIR support. (RL)
+  * libgimpprint-doc uses ps instead of dvi manual, due to inclusion
+    of graphics (RL)
+  * gimp1.2-print no longer registers documentation with doc-base, as
+    the manual is provided in libgimpprint-doc (RL)
+  * Disable building of translated PPD files (RL)
+  
+ -- Eric Sharkey <sharkey@debian.org>  Sun, 25 Nov 2001 22:20:33 -0500
+
+gimp-print (4.1.99-b1-1) unstable; urgency=low
+
+  * New upstream release, Closes: #110066
+  * Remove README.dither from libgimpprint-dev.docs (Roger Leigh)
+  * Add image samples to gimp1.2-print and cupsys-driver-gimpprint (RL)
+  * Change rules and control to use ABI library versioning (RL)
+  * Changed library version names to reflect upstream library
+    versioning change to ABI versioning. (RL)
+
+ -- Eric Sharkey <sharkey@debian.org>  Mon, 23 Jul 2001 10:49:04 -0400
+
+gimp-print (4.1.99-a2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eric Sharkey <sharkey@debian.org>  Mon, 23 Jul 2001 10:49:04 -0400
+
+gimp-print (4.1.99-a1-1) unstable; urgency=low
+
+  * New upstream release  (first 4.2 pre-release)
+
+ -- Eric Sharkey <sharkey@debian.org>  Tue, 10 Jul 2001 16:19:03 -0400
+
+gimp-print (4.1.10-1) unstable; urgency=low
+
+  * New upstream release  (4.1.8 and 4.1.9 were buggy)
+
+ -- Eric Sharkey <sharkey@debian.org>  Fri, 29 Jun 2001 23:08:27 -0400
+
+gimp-print (4.1.7-1) unstable; urgency=low
+
+  * New package libgimpprint-doc for Info and dvi docs. (Roger Leigh)
+  * Change debian/rules to use separate binary-arch and binary-indep
+    targets (Roger Leigh)
+  * New upstream release
+
+ -- Eric Sharkey <sharkey@debian.org>  Wed,  9 May 2001 12:19:43 -0400
+
+gimp-print (4.1.6-2) unstable; urgency=low
+
+  * Fix build dependencies to include flex, Closes: #96401
+
+ -- Eric Sharkey <sharkey@debian.org>  Tue,  8 May 2001 20:09:30 -0400
+
+gimp-print (4.1.6-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Eric Sharkey <sharkey@debian.org>  Mon, 30 Apr 2001 13:45:56 -0400
+
+gimp-print (4.1.5-2.01) unstable; urgency=low
+
+  * Recompile 4.1.5-2 with updated debhelper to fix dependencies
+  * Closes #90741
+
+ -- Eric Sharkey <sharkey@debian.org>  Fri,  6 Apr 2001 21:11:15 -0400
+
+gimp-print (4.1.5-2) unstable; urgency=low
+
+  * Clean up build process so that things work even if some scripts
+    don't have execute permissions, complicate things a bit by using
+    funky building script, Closes #89283, I hope...
+
+ -- Eric Sharkey <sharkey@debian.org>  Thu, 15 Mar 2001 21:54:52 -0500
+
+gimp-print (4.1.5-1) unstable; urgency=low
+
+  * New upstream release
+  * First Official version uploaded to Debian
+  * Close ITP bug for wnpp, Closes #85563
+
+ -- Eric Sharkey <sharkey@debian.org>  Fri,  2 Mar 2001 19:59:11 -0500
+
+gimp-print (4.1.4-2) unstable; urgency=low
+
+  * Repackage gimp-print after forking the Debian branch from 4.1.4
+  * Add version numbers to the libgimpprint package name
+  * Move documentation files from libgimpprint to libgimpprint-dev
+
+ -- Eric Sharkey <sharkey@debian.org>  Tue, 27 Feb 2001 11:22:18 -0500
+
+gimp-print (4.1.4-1) unstable; urgency=low
+
+  * New upstream release
+  * Debian package rewritten from scratch.
+  * Added diversion of the print plugin that is part of the GIMP
+    package to /usr/lib/gimp/1.2/print
+  * Fixed shared library dependencies for programs linked with
+    libgimpprint
+  * Added /etc/cups/command.types as a conffile for package cupsys-
+    driver-gimpprint
+  * Added gimp1.2-print html and sgml docs to doc-base
+  * Remove /etc/cups in postrm for cupsys-driver-gimprint (but
+    won't if not empty)
+  * Added versioned debhelper Build-Depends
+
+ -- Roger Leigh <roger@whinlatter.uklinux.net>  Fri, 16 Feb 2001 00:16:10 +0000
+
+gimp-print (4.0.2-1) unstable; urgency=low
+
+  * Debian packages of the latest GP
+
+ -- Eric Sharkey <sharkey@superk.physics.sunysb.edu>  Sun, 12 Nov 2000 04:46:54 +0900
+
+gimp-print (3.1.4-1) unstable; urgency=low
+
+  * Debianised gimp-print built from gimp-print CVS at sourceforge.
+
+ -- Charles Briscoe-Smith <cpbs@debian.org>  Wed, 24 May 2000 00:39:54 +0100
+
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..11cb415
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,327 @@
+Source: gutenprint
+Section: graphics
+Priority: optional
+Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
+Uploaders: Roger Leigh <rleigh@debian.org>
+Standards-Version: 3.6.2
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+
+Package: gimp-print
+Architecture: any
+Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1)
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Enhances: gimp
+Description: print plugin for the GIMP
+ This package includes the Print plugin for the GIMP.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: cupsys-driver-gimpprint
+Architecture: any
+Section: graphics
+Depends: cupsys-driver-gutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ cupsys-driver-gimpprint to cupsys-driver-gutenprint (its
+ successor).  It may be safely removed after upgrading.
+
+Package: cupsys-driver-gutenprint
+Architecture: any
+Section: graphics
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.1.23) | cups (>= 1.1.23)
+Recommends: gnome-gv | postscript-viewer
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Description: printer drivers for CUPS
+ This package includes a CUPS driver based on Gutenprint.
+ .
+ The CUPS drivers contain all of the files needed to support
+ photo-quality printing on any printer supported by Gutenprint.  You
+ can find out more about the Common UNIX Printing System ("CUPS"), an
+ IPP-based printing system for UNIX/Linux, at:
+ .
+   http://www.cups.org
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprint-dev
+Architecture: any
+Section: libdevel
+Depends: libgutenprint2 (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver library
+ This package contains the header files for the Gutenprint library,
+ along with a static version of libgutenprint.
+ .
+ Install this package if you wish to develop programs that use
+ libgutenprint.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprint-doc
+Architecture: all
+Section: doc
+Suggests: libgutenprint-dev (= ${Source-Version})
+Description: documentation for the Gutenprint printer driver library
+ This package contains lots of info-files, DVI docs and other
+ documentation about the Gutenprint library for photo-quality
+ printing.
+ .
+ Install this package if you want to have lots of info about the
+ Gutenprint library when you're programming.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprint2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Suggests: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver library
+ This package includes the Gutenprint shared library, needed to
+ run programs using Gutenprint drivers.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui1-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui1-1 (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.  This package is intended for use only by cinepaint
+ and gimp-1.2.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui1-1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library.  libgutenprintui
+ contains GTK+ widgets which may be used for print dialogs etc. for
+ use with libgutenprint.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui2-1 (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library, necessary to run
+ gimp-print.  libgutenprintui contains GTK+ widgets which may be
+ used for print dialogs etc. for use with libgutenprint.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: gutenprint-locales
+Architecture: all
+Section: libs
+Description: locale data files for Gutenprint
+ This package contains the i18n files of Gutenprint, used by
+ libgutenprint2, cupsys-driver-gutenprint and
+ escputil.  It is also used by the GIMP Print plugin.
+ .
+ They are needed when you want the programs in Gutenprint to print
+ their messages in other languages than US English.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: escputil
+Architecture: any
+Section: utils
+Depends: ${shlibs:Depends}
+Suggests: gutenprint-locales (>= ${Source-Version})
+Description: maintenance utility for Epson Stylus printers
+ escputil is a utility to clean and align the heads of Epson Stylus
+ printers.  It can also check the current ink levels in the printer.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+  .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: ijsgimpprint
+Architecture: any
+Section: text
+Depends: ijsgutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ ijsgimpprint to ijsgutenprint (its successor).  It may be
+ safely removed after upgrading.
+
+Package: ijsgutenprint
+Architecture: any
+Section: text
+Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14)
+Description: inkjet server - Ghostscript driver for Gutenprint
+ This package contains the ijsgutenprint binary which provides
+ Ghostscript with a Gutenprint driver, including all printers
+ supported by Gutenprint.  ijsgutenprint is an IJS server (driver),
+ which communicates with Ghostscript (an IJS client) using the IJS
+ (InkJet Server) communications protocol.  IJS is a method for
+ separating ghostscript drivers from ghostscript, to allow
+ ghostscript to be more extensible.
+ .
+ If you wish to print using Ghostscript and the Gutenprint drivers,
+ install this package.  This is typical for LPRng setups.  If you
+ are using CUPS, cupsys-driver-gutenprint is a better choice, but
+ this package will still work with the appropriate foomatic setup
+ if you wish to make use of foomatic.
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: foomatic-db-gimp-print
+Architecture: all
+Section: text
+Depends: foomatic-db-gutenprint (>= ${Source-Version})
+Description: linuxprinting.org printer support - database for Gimp-Print printer drivers
+ This is a transitional package to migrate existing users of
+ foomatic-db-gimp-print to foomatic-db-gutenprint (its successor).  It
+ may be safely removed after upgrading.
+
+Package: foomatic-db-gutenprint
+Architecture: all
+Section: text
+Depends: foomatic-db, ijsgutenprint (>= ${Source-Version})
+Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9)
+Description: linuxprinting.org printer support - database for Gutenprint printer drivers
+ Foomatic is a printing system designed to make it easier to set up
+ common printers for use with Debian (and other operating systems).
+ It provides the "glue" between a print spooler (like CUPS or lpr) and
+ your actual printer, by telling your computer how to process files
+ sent to the printer.
+ .
+ This package includes support for printers using the Gutenprint
+ printer driver suite.
+ .
+ Home Page: http://www.linuxprinting.org/
+ .
+ This is Gutenprint version 5.0.0-rc2, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
diff --git a/debian/control.gfdl b/debian/control.gfdl
new file mode 100644
index 0000000..cd1e1c4
--- /dev/null
+++ b/debian/control.gfdl
@@ -0,0 +1,23 @@
+Package: gutenprint-doc
+Architecture: all
+Section: doc
+Suggests: cupsys-driver-gutenprint (>= ${Source-Version}), foomatic-db-gutenprint (>= ${Source-Version}), gimp-print (>= ${Source-Version}), ijsgutenprint (>= ${Source-Version})
+Description: users' guide for Gutenprint and CUPS
+ This package contains a user guide for programs using the
+ Gutenprint library for photographic quality printing.  Currently
+ this covers using the Print plugin for the GIMP and the Common Unix
+ Printing System (CUPS).
+ .
+ The documentation is available in both HTML and PDF formats for
+ on-line viewing and hardcopy.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..6026fca
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,327 @@
+Source: gutenprint
+Section: graphics
+Priority: optional
+Maintainer: Debian Printing Group <debian-printing@lists.debian.org>
+Uploaders: Roger Leigh <rleigh@debian.org>
+Standards-Version: 3.6.2
+Build-Depends: libcupsys2-dev, libcupsimage2-dev, libgtk1.2-dev, libgimp2.0-dev, libreadline5-dev, libijs-dev (>= 0.35-1), debhelper (>= 4.0.2), xlibs-dev, zlib1g-dev, flex, gettext (>= 0.11.5), foomatic-db-engine (>= 3.0.1-1), chrpath (>= 0.12), dpatch
+
+Package: gimp-print
+Architecture: any
+Depends: ${shlibs:Depends}, gimp (>= 2.0.4-1)
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Enhances: gimp
+Description: print plugin for the GIMP
+ This package includes the Print plugin for the GIMP.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: cupsys-driver-gimpprint
+Architecture: any
+Section: graphics
+Depends: cupsys-driver-gutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ cupsys-driver-gimpprint to cupsys-driver-gutenprint (its
+ successor).  It may be safely removed after upgrading.
+
+Package: cupsys-driver-gutenprint
+Architecture: any
+Section: graphics
+Depends: ${shlibs:Depends}, perl (>= 5.8.0), cupsys (>= 1.1.23) | cups (>= 1.1.23)
+Recommends: gnome-gv | postscript-viewer
+Suggests: gutenprint-doc (>= ${Source-Version}), gutenprint-locales (>= ${Source-Version})
+Replaces: cupsys-driver-gimpprint, cupsys-driver-gimpprint-data
+Description: printer drivers for CUPS
+ This package includes a CUPS driver based on Gutenprint.
+ .
+ The CUPS drivers contain all of the files needed to support
+ photo-quality printing on any printer supported by Gutenprint.  You
+ can find out more about the Common UNIX Printing System ("CUPS"), an
+ IPP-based printing system for UNIX/Linux, at:
+ .
+   http://www.cups.org
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprint-dev
+Architecture: any
+Section: libdevel
+Depends: libgutenprint#LIBRARY_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver library
+ This package contains the header files for the Gutenprint library,
+ along with a static version of libgutenprint.
+ .
+ Install this package if you wish to develop programs that use
+ libgutenprint.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprint-doc
+Architecture: all
+Section: doc
+Suggests: libgutenprint-dev (= ${Source-Version})
+Description: documentation for the Gutenprint printer driver library
+ This package contains lots of info-files, DVI docs and other
+ documentation about the Gutenprint library for photo-quality
+ printing.
+ .
+ Install this package if you want to have lots of info about the
+ Gutenprint library when you're programming.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprint#LIBRARY_VERSION#
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Suggests: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver library
+ This package includes the Gutenprint shared library, needed to
+ run programs using Gutenprint drivers.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui1-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui1-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.  This package is intended for use only by cinepaint
+ and gimp-1.2.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui1-#LIBRARYUI_VERSION#
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library.  libgutenprintui
+ contains GTK+ widgets which may be used for print dialogs etc. for
+ use with libgutenprint.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-dev
+Architecture: any
+Section: devel
+Depends: libgutenprintui2-#LIBRARYUI_VERSION# (= ${Source-Version}), pkg-config (>= 0.14.0)
+Suggests: libgutenprint-doc (= ${Source-Version})
+Description: development files for the Gutenprint printer driver user interface library
+ This package contains the header files for the libgutenprintui
+ library, along with a static version of libgutenprintui.
+ libgutenprintui contains GTK+ widgets which may be used for print
+ dialogs etc. for use with libgutenprint.
+ .
+ Install this package if you wish to develop packages that use
+ libgutenprintui.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: libgutenprintui2-#LIBRARYUI_VERSION#
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Recommends: gutenprint-locales (>= ${Source-Version})
+Description: runtime for the Gutenprint printer driver user interface library
+ This package includes the libgutenprintui library, necessary to run
+ gimp-print.  libgutenprintui contains GTK+ widgets which may be
+ used for print dialogs etc. for use with libgutenprint.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta
+ development release in the 5.0 line.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: gutenprint-locales
+Architecture: all
+Section: libs
+Description: locale data files for Gutenprint
+ This package contains the i18n files of Gutenprint, used by
+ libgutenprint#LIBRARY_VERSION#, cupsys-driver-gutenprint and
+ escputil.  It is also used by the GIMP Print plugin.
+ .
+ They are needed when you want the programs in Gutenprint to print
+ their messages in other languages than US English.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: escputil
+Architecture: any
+Section: utils
+Depends: ${shlibs:Depends}
+Suggests: gutenprint-locales (>= ${Source-Version})
+Description: maintenance utility for Epson Stylus printers
+ escputil is a utility to clean and align the heads of Epson Stylus
+ printers.  It can also check the current ink levels in the printer.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+  .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: ijsgimpprint
+Architecture: any
+Section: text
+Depends: ijsgutenprint (>= ${Source-Version})
+Description: printer drivers for CUPS
+ This is a transitional package to migrate existing users of
+ ijsgimpprint to ijsgutenprint (its successor).  It may be
+ safely removed after upgrading.
+
+Package: ijsgutenprint
+Architecture: any
+Section: text
+Depends: ${shlibs:Depends}, gs-esp (>= 6.53) | gs-gpl (>= 8.01-1) | gs (>= 6.53) | gs-afpl (>= 8.14)
+Description: inkjet server - Ghostscript driver for Gutenprint
+ This package contains the ijsgutenprint binary which provides
+ Ghostscript with a Gutenprint driver, including all printers
+ supported by Gutenprint.  ijsgutenprint is an IJS server (driver),
+ which communicates with Ghostscript (an IJS client) using the IJS
+ (InkJet Server) communications protocol.  IJS is a method for
+ separating ghostscript drivers from ghostscript, to allow
+ ghostscript to be more extensible.
+ .
+ If you wish to print using Ghostscript and the Gutenprint drivers,
+ install this package.  This is typical for LPRng setups.  If you
+ are using CUPS, cupsys-driver-gutenprint is a better choice, but
+ this package will still work with the appropriate foomatic setup
+ if you wish to make use of foomatic.
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
+
+Package: foomatic-db-gimp-print
+Architecture: all
+Section: text
+Depends: foomatic-db-gutenprint (>= ${Source-Version})
+Description: linuxprinting.org printer support - database for Gimp-Print printer drivers
+ This is a transitional package to migrate existing users of
+ foomatic-db-gimp-print to foomatic-db-gutenprint (its successor).  It
+ may be safely removed after upgrading.
+
+Package: foomatic-db-gutenprint
+Architecture: all
+Section: text
+Depends: foomatic-db, ijsgutenprint (>= ${Source-Version})
+Conflicts: foomatic-bin (<< 2.9), foomatic-db (<< 2.9)
+Description: linuxprinting.org printer support - database for Gutenprint printer drivers
+ Foomatic is a printing system designed to make it easier to set up
+ common printers for use with Debian (and other operating systems).
+ It provides the "glue" between a print spooler (like CUPS or lpr) and
+ your actual printer, by telling your computer how to process files
+ sent to the printer.
+ .
+ This package includes support for printers using the Gutenprint
+ printer driver suite.
+ .
+ Home Page: http://www.linuxprinting.org/
+ .
+ This is Gutenprint version #UPSTREAM_VERSION#, a beta release
+ in the 5.0 series.
+ .
+ Gutenprint is the print facility for the GIMP, and in addition a
+ suite of drivers that may be used with common UNIX spooling systems
+ using GhostScript or CUPS.  These drivers provide printing quality
+ for UNIX/Linux on a par with proprietary vendor-supplied drivers in
+ many cases, and can be used for many of the most demanding printing
+ tasks.  Gutenprint was formerly known as Gimp-Print.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..02805bb
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,21 @@
+This package was debianized by Roger Leigh <roger@whinlatter.uklinux.net> on
+Fri, 26 Jan 2001 17:42:06 +0000.
+
+It was downloaded from cvs.gimp-print.sourceforge.net
+
+Upstream Authors: Michael Sweet (mike@easysw.com)
+                  Robert Krawitz (rlk@alum.mit.edu)
+
+Copyright:
+
+This software is copyright (c) 1997-2003 Michael Sweet and Robert Krawitz
+
+You are free to distribute this software under the terms of
+the GNU General Public License.
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL file.
+
+The User's Guide (in the gutenprint-doc package) is licensed under the
+terms of the GNU Free Documentation License, version 1.1.  The full
+license text is contained within the manual.
+
diff --git a/debian/cupsys-driver-gutenprint.docs b/debian/cupsys-driver-gutenprint.docs
new file mode 100644
index 0000000..0b55f7f
--- /dev/null
+++ b/debian/cupsys-driver-gutenprint.docs
@@ -0,0 +1,2 @@
+README
+doc/FAQ.html
diff --git a/debian/cupsys-driver-gutenprint.install b/debian/cupsys-driver-gutenprint.install
new file mode 100644
index 0000000..291f653
--- /dev/null
+++ b/debian/cupsys-driver-gutenprint.install
@@ -0,0 +1,12 @@
+debian/install/etc/cups                                etc
+debian/install/usr/bin/cups-calibrate                  usr/bin
+debian/install/usr/sbin/cups-genppd.5.0                usr/sbin
+debian/install/usr/sbin/cups-genppdconfig.5.0          usr/sbin
+debian/install/usr/sbin/cups-genppdupdate.5.0          usr/sbin
+debian/install/usr/lib/cups                            usr/lib
+debian/install/usr/share/cups/calibrate.ppm            usr/share/cups
+debian/install/usr/share/man/man8/cups-calibrate.8     usr/share/man/man8
+debian/install/usr/share/man/man8/cups-genppd.8        usr/share/man/man8
+debian/install/usr/share/man/man8/cups-genppdconfig.8  usr/share/man/man8
+debian/install/usr/share/man/man8/cups-genppdupdate.8  usr/share/man/man8
+samples/profile.jpg                                    usr/share/doc/cupsys-driver-gutenprint/samples
diff --git a/debian/cupsys-driver-gutenprint.postinst b/debian/cupsys-driver-gutenprint.postinst
new file mode 100644
index 0000000..0784757
--- /dev/null
+++ b/debian/cupsys-driver-gutenprint.postinst
@@ -0,0 +1,47 @@
+#! /bin/sh
+# postinst script for cupsys-driver-gutenprint
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see /usr/doc/packaging-manual/
+#
+# quoting from the policy:
+#     Any necessary prompting should almost always be confined to the
+#     post-installation script, and should be protected with a conditional
+#     so that unnecessary prompting doesn't happen if a package's
+#     installation fails and the `postinst' is called with `abort-upgrade',
+#     `abort-remove' or `abort-deconfigure'.
+
+#s/^if\s+\[\s+"\$1"\s+=\s+"configure"\s+\];\s+then\s+ldconfig\b//m;
+
+if [ "$1" = "configure" ]; then
+# Upgrade in-use PPD files
+  /usr/sbin/cups-genppdconfig.5.0 -u
+  /usr/sbin/cups-genppdupdate.5.0
+# Restart CUPSys (to register new and updated PPDs)
+  [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload
+elif [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ] || [ "$1" = "abort-deconfigure" ]; then
+  :
+else
+  echo "postinst called with unknown argument \`$1'" >&2
+  exit 0
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/cupsys-driver-gutenprint.postrm b/debian/cupsys-driver-gutenprint.postrm
new file mode 100644
index 0000000..63c1b49
--- /dev/null
+++ b/debian/cupsys-driver-gutenprint.postrm
@@ -0,0 +1,36 @@
+#! /bin/sh
+# postrm script for cupsys-driver-gutenprint
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+if [ "$1" = remove ]; then
+    # Remove generated PPDs
+    rm -rf /usr/share/cups/model/gutenprint/5.0
+    [ -x /etc/init.d/cupsys ] && /etc/init.d/cupsys force-reload
+fi
+
+if [ "$1" = purge ]; then
+    # Remove /etc/cups if it is empty
+    rmdir --ignore-fail-on-non-empty /etc/cups
+    rmdir --ignore-fail-on-non-empty /usr/share/cups/model/gutenprint
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
diff --git a/debian/escputil.docs b/debian/escputil.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/escputil.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/escputil.install b/debian/escputil.install
new file mode 100644
index 0000000..75d88a3
--- /dev/null
+++ b/debian/escputil.install
@@ -0,0 +1,2 @@
+debian/install/usr/bin/escputil               usr/bin
+debian/install/usr/share/man/man1/escputil.1  usr/share/man/man1
diff --git a/debian/foomatic-db-gutenprint.install b/debian/foomatic-db-gutenprint.install
new file mode 100644
index 0000000..dc49f93
--- /dev/null
+++ b/debian/foomatic-db-gutenprint.install
@@ -0,0 +1,2 @@
+debian/install/usr/share/foomatic/db/source/driver/gutenprint*.xml  usr/share/foomatic/db/source/driver
+debian/install/usr/share/foomatic/db/source/opt/gutenprint-ijs*     usr/share/foomatic/db/source/opt
diff --git a/debian/gimp-print.docs b/debian/gimp-print.docs
new file mode 100644
index 0000000..7610b61
--- /dev/null
+++ b/debian/gimp-print.docs
@@ -0,0 +1,3 @@
+README
+doc/*.html
+doc/*.png
diff --git a/debian/gimp-print.install b/debian/gimp-print.install
new file mode 100644
index 0000000..8932be3
--- /dev/null
+++ b/debian/gimp-print.install
@@ -0,0 +1,2 @@
+debian/install/usr/lib/gimp/2.0/plug-ins/print  usr/lib/gimp/2.0/plug-ins
+samples/*.png                                   usr/share/doc/gimp-print/samples
diff --git a/debian/gimp-print.postrm b/debian/gimp-print.postrm
new file mode 100644
index 0000000..87c41e4
--- /dev/null
+++ b/debian/gimp-print.postrm
@@ -0,0 +1,39 @@
+#! /bin/sh
+# postrm script for gimp-print
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see /usr/doc/packaging-manual/
+
+case "$1" in
+       purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+           if [ remove = "$1" ]; then
+               dpkg-divert --package gimp-print --remove --rename \
+                  --divert /usr/lib/gimp/2.0/print.orig \
+	          /usr/lib/gimp/2.0/plug-ins/print
+           fi
+        ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 0
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+
diff --git a/debian/gimp-print.preinst b/debian/gimp-print.preinst
new file mode 100644
index 0000000..36782c3
--- /dev/null
+++ b/debian/gimp-print.preinst
@@ -0,0 +1,39 @@
+#! /bin/sh
+# preinst script for gimp-print
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+
+case "$1" in
+    install|upgrade)
+        if [ install = "$1" ]; then
+           dpkg-divert --package gimp-print --add --rename \
+	      --divert /usr/lib/gimp/2.0/print.orig \
+	      /usr/lib/gimp/2.0/plug-ins/print
+	fi
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 0
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/gutenprint-doc.doc-base b/debian/gutenprint-doc.doc-base
new file mode 100644
index 0000000..b7a0cd2
--- /dev/null
+++ b/debian/gutenprint-doc.doc-base
@@ -0,0 +1,14 @@
+Document: gutenprint-doc
+Title: The User's Guide to the Gutenprint Top Quality Printer Drivers
+Author: Andy Stewart
+Abstract: The Gutenprint Top Quality Printer Drivers are a set of
+ printer drivers written to take advantage of the full capabilities
+ of a wide range of printers. This document will explain how to use
+ the Gutenprint software to achieve high quality printouts from the
+ GIMP (GNU Image Manipulation Program) and CUPS (Common Unix
+ Printing System).
+Section: Apps/Graphics
+
+Format: HTML
+Index: /usr/share/doc/gutenprint-doc/html/index.html
+Files: /usr/share/doc/gutenprint-doc/html/*
diff --git a/debian/gutenprint-doc.install b/debian/gutenprint-doc.install
new file mode 100644
index 0000000..d481933
--- /dev/null
+++ b/debian/gutenprint-doc.install
@@ -0,0 +1,2 @@
+debian/install/usr/share/gutenprint/doc/*.pdf                usr/share/doc/gutenprint-doc
+debian/install/usr/share/gutenprint/doc/html                 usr/share/doc/gutenprint-doc
diff --git a/debian/gutenprint-locales.install b/debian/gutenprint-locales.install
new file mode 100644
index 0000000..525d334
--- /dev/null
+++ b/debian/gutenprint-locales.install
@@ -0,0 +1 @@
+debian/install/usr/share/locale  usr/share
diff --git a/debian/ijsgutenprint.install b/debian/ijsgutenprint.install
new file mode 100644
index 0000000..46c6e2d
--- /dev/null
+++ b/debian/ijsgutenprint.install
@@ -0,0 +1,2 @@
+debian/install/usr/bin/ijsgutenprint.5.0           usr/bin
+debian/install/usr/share/man/man1/ijsgutenprint.1  usr/share/man/man1
diff --git a/debian/libgutenprint-dev.docs b/debian/libgutenprint-dev.docs
new file mode 100644
index 0000000..0b55f7f
--- /dev/null
+++ b/debian/libgutenprint-dev.docs
@@ -0,0 +1,2 @@
+README
+doc/FAQ.html
diff --git a/debian/libgutenprint-dev.install b/debian/libgutenprint-dev.install
new file mode 100644
index 0000000..b680b22
--- /dev/null
+++ b/debian/libgutenprint-dev.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprint.so         usr/lib
+debian/install/usr/lib/pkgconfig/gutenprint.pc  usr/lib/pkgconfig
+debian/install/usr/include/gutenprint           usr/include
diff --git a/debian/libgutenprint-doc.doc-base.developer b/debian/libgutenprint-doc.doc-base.developer
new file mode 100644
index 0000000..e1a7e2a
--- /dev/null
+++ b/debian/libgutenprint-doc.doc-base.developer
@@ -0,0 +1,15 @@
+Document: libgutenprint-doc-developer
+Title: The libgutenprint Reference Manual
+Author: The Gutenprint Project
+Abstract: The gutenprint library routines give programmers an interface to
+ print high quality bitmap images on most modern printers.  It includes drivers
+ which provide printing quality for UNIX/Linux on a par with proprietary
+ vendor-supplied drivers in many cases, and can be used for many of the most
+ demanding printing tasks.  This manual covers developing programs that use
+ libgutenprint for printing, as well as the concepts and internals of the
+ library.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgutenprint-doc/developer/html/index.html
+Files: /usr/share/doc/libgutenprint-doc/developer/html/*.html
diff --git a/debian/libgutenprint-doc.doc-base.reference b/debian/libgutenprint-doc.doc-base.reference
new file mode 100644
index 0000000..303c3ef
--- /dev/null
+++ b/debian/libgutenprint-doc.doc-base.reference
@@ -0,0 +1,14 @@
+Document: libgutenprint-doc-reference
+Title: The libgutenprint API Reference Manual
+Author: The Gutenprint Project
+Abstract: The gutenprint library routines give programmers an interface to
+ print high quality bitmap images on most modern printers.  It includes drivers
+ which provide printing quality for UNIX/Linux on a par with proprietary
+ vendor-supplied drivers in many cases, and can be used for many of the most
+ demanding printing tasks. This manual is a reference to the libgutenprint
+ library.
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libgutenprint-doc/reference/html/index.html
+Files: /usr/share/doc/libgutenprint-doc/reference/html/*.html
diff --git a/debian/libgutenprint-doc.install b/debian/libgutenprint-doc.install
new file mode 100644
index 0000000..2864212
--- /dev/null
+++ b/debian/libgutenprint-doc.install
@@ -0,0 +1,2 @@
+doc/developer/reference-html/*  usr/share/doc/libgutenprint-doc/developer/html
+doc/gutenprint/*                usr/share/doc/libgutenprint-doc/reference
diff --git a/debian/libgutenprint2.install.in b/debian/libgutenprint2.install.in
new file mode 100644
index 0000000..1a0d0f4
--- /dev/null
+++ b/debian/libgutenprint2.install.in
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprint.so.*                  usr/lib
+debian/install/usr/lib/gutenprint                          usr/lib
+debian/install/usr/share/gutenprint/#UPSTREAM_VERSION#     usr/share/gutenprint
diff --git a/debian/libgutenprintui1-1.install b/debian/libgutenprintui1-1.install
new file mode 100644
index 0000000..ed8acb5
--- /dev/null
+++ b/debian/libgutenprintui1-1.install
@@ -0,0 +1 @@
+debian/install/usr/lib/libgutenprintui.so.*  usr/lib
diff --git a/debian/libgutenprintui1-dev.install b/debian/libgutenprintui1-dev.install
new file mode 100644
index 0000000..5823133
--- /dev/null
+++ b/debian/libgutenprintui1-dev.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprintui.so          usr/lib
+debian/install/usr/lib/pkgconfig/gutenprintui.pc   usr/lib/pkgconfig
+debian/install/usr/include/gutenprintui            usr/include
diff --git a/debian/libgutenprintui2-1.install b/debian/libgutenprintui2-1.install
new file mode 100644
index 0000000..42c6a6f
--- /dev/null
+++ b/debian/libgutenprintui2-1.install
@@ -0,0 +1 @@
+debian/install/usr/lib/libgutenprintui2.so.*  usr/lib
diff --git a/debian/libgutenprintui2-dev.install b/debian/libgutenprintui2-dev.install
new file mode 100644
index 0000000..3ea421f
--- /dev/null
+++ b/debian/libgutenprintui2-dev.install
@@ -0,0 +1,3 @@
+debian/install/usr/lib/libgutenprintui2.so         usr/lib
+debian/install/usr/lib/pkgconfig/gutenprintui2.pc  usr/lib/pkgconfig
+debian/install/usr/include/gutenprintui2           usr/include
diff --git a/debian/patches/00list b/debian/patches/00list
new file mode 100644
index 0000000..76b2013
--- /dev/null
+++ b/debian/patches/00list
@@ -0,0 +1 @@
+05_genppdconfig_remove_perlmenu.dpatch
diff --git a/debian/patches/05_genppdconfig_remove_perlmenu.dpatch b/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
new file mode 100755
index 0000000..afbd9d2
--- /dev/null
+++ b/debian/patches/05_genppdconfig_remove_perlmenu.dpatch
@@ -0,0 +1,257 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_genppdconfig_remove_perlmenu.dpatch by  <rleigh@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Remove perlmenu support from cups-genppdconfig.in
+
+@DPATCH@
+
+diff -urN gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in
+--- gutenprint-4.3.99+cvs20050901.original/src/cups/cups-genppdconfig.in	2005-09-03 19:46:25.240866064 +0100
++++ gutenprint-4.3.99+cvs20050901/src/cups/cups-genppdconfig.in	2005-09-02 22:52:31.936066848 +0100
+@@ -36,12 +36,8 @@
+ sub create_dir($);
+ sub dialog_read($$);
+ sub dialog_read_list (\%\@$$);
+-sub perl_menu ($$$$@);
+-sub perl_menu_read_list (\%\@$$);
+-sub perl_menu_mult ($$@);
+ 
+ my $DIALOG = "@DIALOG@";                        # version of dialog to call
+-my $use_dialog = 0;                             # whether to use dialog
+ my $BACKTITLE = "Gutenprint CUPS PPD creation"; # dialog screen title
+ my %printers;                                   # master list of printers
+ my %languages;                                  # master list of languages
+@@ -74,16 +70,6 @@
+     exit 0;
+ }
+ 
+-# Can we use dialog?
+-if (-x $DIALOG) {
+-    $use_dialog = 1;
+-} else {
+-    BEGIN { $Curses::OldCurses = 1; }
+-    use Curses;
+-    use perlmenu;
+-    perl_menu_defaults();
+-}
+-
+ while (my $option = main_menu()) { # Display main menu and run selection
+     if ($option eq "Help") {
+ 	display_help();
+@@ -218,21 +204,14 @@
+ 	[ "Create", "Create PPDs" ],
+ 	[ "Exit", "Exit the program" ]
+     );
+-    if ($use_dialog) {
+-	my $dialog_options;
+-	for my $i ( 0 .. $#menu_options) {
+-	    for my $j ( 0 .. $#{$menu_options[$i]}) {
+-		$dialog_options .= "\"$menu_options[$i][$j]\" ";
+-	    }
+-	}
+-	while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) {
+-	    chomp ($option);
+-	    return $option;
++    my $dialog_options;
++    for my $i ( 0 .. $#menu_options) {
++	for my $j ( 0 .. $#{$menu_options[$i]}) {
++	    $dialog_options .= "\"$menu_options[$i][$j]\" ";
+ 	}
+-    } else {
+-	$option = perl_menu(1, "Main menu", "Choose an option.",
+-			    "Current PPD directory: $chosen_location",
+-			    @menu_options);
++    }
++    while (defined($option = dialog_read("cups-genppdconfig", "--no-cancel --default-item Printers --menu \"$menu_desc\" 20 70 6 $dialog_options"))) {
++	chomp ($option);
+ 	return $option;
+     }
+ }
+@@ -310,19 +289,7 @@
+     or die "can't open temporary help file";
+     print $HELPFILE "$help_text";
+     $HELPFILE->flush();
+-    if ($use_dialog) {
+-        dialog_read("Help", "--textbox $helpfilename 18 76");
+-    } else {
+-        &menu_init(0, "Help", 0);
+-        open(TEMP,$helpfilename);
+-        while (<TEMP>) {
+-            s/^(\t+)/'        ' x length($1)/e;
+-            &expand($_) if /\t/;
+-            &menu_item($_,"", -1);
+-        }
+-       close(TEMP);
+-       &menu_display("Help viewer: (RET/u/t) exit  (n/p) next/previous page (b) beginning (e) end");
+-    }
++    dialog_read("Help", "--textbox $helpfilename 18 76");
+     unlink0($HELPFILE, $helpfilename) or die "Error unlinking help file $helpfilename safely: $!";
+     close($HELPFILE) or die "can't close help file $helpfilename: $!";
+     return;
+@@ -336,12 +303,7 @@
+ sub choose_printers {
+     my $title = "Printer selection";
+     my $options = "--checklist \"Choose the printer models you wish to use with CUPS.\" 18 54 11";
+-    if ($use_dialog) {
+-	dialog_read_list(%printers, @chosen_printers, $title, $options);
+-    } else {
+-	perl_menu_read_list(%printers, @chosen_printers, $title,
+-			    "Choose the printer models you wish to use with CUPS.");
+-    }
++    dialog_read_list(%printers, @chosen_printers, $title, $options);
+ }
+ 
+ 
+@@ -352,12 +314,7 @@
+ sub choose_languages {
+     my $title = "Language selection";
+     my $options = "--checklist \"Choose the languages you wish to use with CUPS.\" 18 54 11";
+-    if ($use_dialog) {
+-	dialog_read_list(%languages, @chosen_languages, $title, $options);
+-    } else {
+-	perl_menu_read_list(%languages, @chosen_languages, $title,
+-			    "Choose the languages you wish to use with CUPS.");
+-    }
++    dialog_read_list(%languages, @chosen_languages, $title, $options);
+ }
+ 
+ 
+@@ -367,12 +324,8 @@
+ #
+ sub choose_location {
+     my $location;
+-    if ($use_dialog) {
+-	$location = dialog_read("Location selection",
+-				"--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location");
+-    } else {
+-	$location = &menu_getstr(5,12,"Directory:", 1, $chosen_location);
+-    }
++    $location = dialog_read("Location selection",
++			    "--inputbox \"Choose a directory to create the PPD files in.\" 8 61 $chosen_location");
+     if (!defined($location)) {
+ 	$location = "";
+     }
+@@ -432,7 +385,7 @@
+     } else {
+ 	$printers = "";
+     }
+-    if (! $silent && $use_dialog) {
++    if (! $silent) {
+ 	open DIALOG, "| $DIALOG --sleep 2 --backtitle \"$BACKTITLE\" --title \"Creating PPD files\" --guage \"Language: \nPPD files: \" 10 72 0"
+ 	    or die "can't fork dialog: $!";
+     }
+@@ -449,7 +402,7 @@
+ 	    if ($percent > 100) {
+ 		$percent = 100;
+ 	    }
+-	    if (! $silent && $use_dialog) {
++	    if (! $silent) {
+ 		print DIALOG "$percent\n";
+ 		print DIALOG "XXX\nLanguage: $language\nPPD files: $count/$total\n\n$file\nXXX\n";
+ 		DIALOG->flush();
+@@ -460,7 +413,7 @@
+ 	}
+ 	close GENPPD or die "can't close cups-genppd pipe: $!";
+     }
+-    if (! $silent && $use_dialog) {
++    if (! $silent) {
+ 	print DIALOG "100\nXXX\nLanguage: \nPPD files: $total/$total\n\nCompleted\nXXX\n";
+ 	close DIALOG or die "can't close dialog pipe";
+     }
+@@ -521,95 +474,3 @@
+ 	@$list=split(/ /, $tmplist);
+     }
+ }
+-
+-
+-# scalar
+-# perl_menu($title)
+-#
+-sub perl_menu ($$$$@) {
+-    my ($top, $title, $question, $subtitle, @items) = @_;
+-    my $selection;
+-    &menu_init(1, "cups-genppdconfig", $top, $title, "$BACKTITLE\n-<$subtitle");
+-
+-    for my $i ( 0 .. $#items) {
+-	&menu_item($items[$i][1], $items[$i][0]);
+-    }
+-
+-    $selection = &menu_display($question);
+-    return $selection;
+-}
+-
+-# scalar
+-# perl_menu_mult($title, $question, @items)
+-#
+-sub perl_menu_mult ($$@) {
+-    my ($title, $question, @items) = @_;
+-    my $selection;
+-    &menu_init(1, "cups-genppdconfig", 0, $title, $BACKTITLE);
+-
+-    for my $i ( 0 .. $#items) {
+-	&menu_item($items[$i][1], $items[$i][0], $items[$i][2]);
+-    }
+-
+-    perl_menu_sel_defaults();
+-    $selection = &menu_display_mult($question);
+-    perl_menu_defaults();
+-    if ($selection eq "%UP%" or $selection eq "%NONE%") {
+-	return undef;
+-    }
+-    return $selection;
+-}
+-
+-
+-#
+-# perl_menu_read_list(%masterlist
+-#                     @chosenlist
+-#                     $title
+-#                     $question
+-#                     - Construct list dialog, entries from %masterlist,
+-#                             defaults from @chosenlist.
+-#
+-sub perl_menu_read_list (\%\@$$) {
+-    my $masterlist = $_[0];
+-    my $list = $_[1];
+-    my $title = $_[2];
+-    my $question = $_[3];
+-    my $tmplist;
+-    my @menulist = ();
+-    my $item;
+-    my $selected;
+-# Make a list for use with perlmenu.
+-    foreach $item (sort keys %$masterlist) {
+-	$selected = 0;
+-	foreach (@$list) {
+-	    if ($item eq $_) {
+-		$selected = 1;
+-		last;
+-	    }
+-	}
+-	my $formatstring = sprintf "%-14s - %s", $item, $masterlist->{$item};
+-	push @menulist, [ $item, $formatstring, $selected ] ;
+-    }
+-    $tmplist = perl_menu_mult("$title", "RET=toggle selection (u/t) exit  (n/p) next/previous page (b) beginning (e) end", @menulist);
+-    if (defined($tmplist)) {
+-	$tmplist =~ s/\"//g;
+-	@$list=split(/,/, $tmplist);
+-    }
+-}
+-
+-
+-#
+-# perl_menu_defaults - set menu defaults
+-#
+-sub perl_menu_defaults {
+-    &menu_prefs(1, 0, 1, 0, "y", 0, 0);
+-}
+-
+-
+-#
+-# perl_menu_sel_defaults - set menu defaults for multiple selections
+-#
+-sub perl_menu_sel_defaults {
+-    &menu_prefs(1, 0, 1, 0, "y", 1, 0);
+-}
+-
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..dca0207
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,150 @@
+#!/usr/bin/make -f
+# rules to package gutenprint
+# $Id: rules,v 1.58 2005/06/26 17:06:59 rleigh Exp $
+#
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# Use dpatch.
+include /usr/share/dpatch/dpatch.make
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
+
+# Get upstream version, and define libgutenprint suffix
+#UPSTREAM_VERSION = $(shell dpkg-parsechangelog | grep ^Version | sed "s/.* //" | sed "s/-[^-]*$$//")
+UPSTREAM_VERSION = 5.0.0-rc2
+UPSTREAM_VERSION_COMPACT = $(shell echo '$(UPSTREAM_VERSION)' | sed "s/\(.*\..*\)\..*/\1/"
+#LIBRARY_VERSION =  -$(UPSTREAM_VERSION)
+LIBRARY_VERSION = 2
+LIBRARYUI_VERSION = 1
+
+GENERATED_FILES = \
+	debian/libgutenprint2.install
+
+autoconfigure: autoconfigure-stamp
+autoconfigure-stamp: debian/control $(GENERATED_FILES)
+	dh_testdir
+	mkdir debian/build; \
+	cd debian/build; \
+	../../configure --host=$(DEB_HOST_GNU_TYPE) \
+	  --build=$(DEB_BUILD_GNU_TYPE) \
+	  --prefix=/usr --mandir=\$${prefix}/share/man \
+	  --disable-static --enable-shared --disable-rpath \
+	  --with-modules=dlopen \
+	  --enable-libgutenprintui --enable-libgutenprintui2 \
+	  --without-gimp --with-gimp2 --with-cups --with-ijs \
+	  --with-foomatic --with-foomatic3 \
+	  --disable-test \
+	  --enable-cups-level3-ppds --disable-translated-cups-ppds \
+	  --disable-cups-level3-ps --disable-static-genppd
+	touch autoconfigure-stamp
+
+
+build: build-stamp debian/control
+build-stamp: patch-stamp autoconfigure-stamp
+	dh_testdir
+
+	cd debian/build; \
+	$(MAKE)
+
+	touch build-stamp
+
+clean: realclean unpatch
+realclean: debian/control
+	dh_testdir
+	rm -f build-stamp autoconfigure-stamp
+
+	-$(MAKE) distclean
+	-test -r /usr/share/misc/config.sub && \
+	  cp -f /usr/share/misc/config.sub scripts/config.sub
+	-test -r /usr/share/misc/config.guess && \
+	  cp -f /usr/share/misc/config.guess scripts/config.guess
+
+	rm -rf debian/build debian/install
+	-$(MAKE) distclean
+
+	rm -f $(GENERATED_FILES)
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build debian/control
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	cd debian/build; \
+	$(MAKE) DESTDIR=`pwd`/../install install
+
+	dh_install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_installchangelogs -i NEWS
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	  cp src/cups/README debian/cupsys-driver-gutenprint/usr/share/doc/cupsys-driver-gutenprint/README.cups
+	  mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppd.5.0.8
+	  mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdconfig.5.0.8
+	  mv debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.8 debian/cupsys-driver-gutenprint/usr/share/man/man8/cups-genppdupdate.5.0.8
+	  mv debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1 debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.5.0.1
+	  ln -s ijsgutenprint.5.0.1.gz debian/ijsgutenprint/usr/share/man/man1/ijsgutenprint.1.gz
+	  ln -s ijsgutenprint.5.0 debian/ijsgutenprint/usr/bin/ijsgutenprint
+	dh_installexamples -a
+	dh_installchangelogs -a NEWS
+	dh_strip -a
+	dh_link -a
+	dh_compress -a
+	dh_fixperms -a
+# Strip DT_RPATH from CUPS binaries.
+	find debian/cupsys-driver-gutenprint/usr/lib -type f -perm +0111 -print0 | xargs -0 chrpath --delete
+	chrpath --delete debian/cupsys-driver-gutenprint/usr/sbin/cups-genppd.5.0
+	dh_makeshlibs -a -V -X usr/lib/gutenprint
+	dh_installdeb -a
+	dh_shlibdeps -a -X usr/lib/gutenprint -l$(CURDIR)/debian/libgutenprint$(LIBRARY_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui1-$(LIBRARYUI_VERSION)/usr/lib:$(CURDIR)/debian/libgutenprintui2-$(LIBRARYUI_VERSION)/usr/lib
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+binary: binary-indep binary-arch
+
+SEDPATTERN = -e "s/\#UPSTREAM_VERSION\#/$(UPSTREAM_VERSION)/g" -e "s/\#LIBRARY_VERSION\#/$(LIBRARY_VERSION)/g" -e "s/\#LIBRARYUI_VERSION\#/$(LIBRARYUI_VERSION)/g"
+
+debian/control: debian/control.in debian/changelog debian/rules
+	sed $(SEDPATTERN) <$< >$@
+
+debian/libgutenprint2.install: debian/libgutenprint2.install.in debian/changelog
+	sed $(SEDPATTERN) <$< >$@
+
+.PHONY: build clean binary-indep binary-arch binary install autoconfigure patch unpatch
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dde0386..4a280c8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.41 2005/04/19 01:31:03 rlk Exp $
+## $Id: Makefile.am,v 1.42 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,13 +17,9 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
-SUBDIRS = developer users_guide
+SUBDIRS = developer
 
 include $(top_srcdir)/scripts/global.mk
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3acbdc8..9f5d134 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -54,6 +54,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gutenprint.dox gutenprintui2.dox
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -68,8 +70,6 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -107,7 +107,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -120,14 +119,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -262,13 +259,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -314,9 +306,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
-SUBDIRS = developer users_guide
+SUBDIRS = developer
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 docdir = $(datadir)/doc/$(PACKAGE)
 MAINTAINERCLEANFILES = \
@@ -345,9 +335,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/doc/README.maintaining b/doc/README.maintaining
index 642a123..4d3c8da 100644
--- a/doc/README.maintaining
+++ b/doc/README.maintaining
@@ -49,7 +49,7 @@ something that you would like covering, please let me know!
 
  -- Roger Leigh <rleigh@debian.org>
 
- $Id: README.maintaining,v 1.19 2004/09/17 18:37:42 rleigh Exp $
+ $Id: README.maintaining,v 1.20 2005/11/21 20:06:30 rleigh Exp $
 
 
 1. Setting up the autotools
@@ -58,10 +58,10 @@ something that you would like covering, please let me know!
 To build Gutenprint from CVS, or to regenerate the build scripts after
 modifying them, you need to install a number of GNU tools:
 
-i.   GNU autoconf (at least 2.54)
-ii.  GNU automake (at least 1.5; 1.7 recommended)
-iii. GNU libtool (at least 1.4.3; 1.5 recommended)
-iv.  GNU gettext (at least 0.11.x)
+i.   GNU autoconf (at least 2.54; at least 2.59 recommended)
+ii.  GNU automake (at least 1.9)
+iii. GNU libtool (at least 1.5; at least 1.5.20 recommended)
+iv.  GNU gettext (at least 0.12; at least 0.14 recommended)
 v.   GNU make (any recent version)
 
 and also
@@ -102,12 +102,6 @@ versions but are the current releases.  I suggest using 1.4 and 1.7
 together.  Different versions of autoconf need separate aclocal
 directories, to prevent m4 macros clashing.
 
-GNU gettext 0.11.x (current) releases will not work properly with
-current CVS Gutenprint because of changes to gettextize.  We need to
-use autopoint, but this will break backward compatibility with 0.10.x
-releases (due to a new autoconf macro being required).  The change
-will need to be made at some point in the near future.
-
 Hopefully these compatibility problems will not be as bad in the
 future...
 
@@ -617,4 +611,4 @@ script included in released versions will not have this problem.
 
 Local Variables:
 mode: text
-End:
\ No newline at end of file
+End:
diff --git a/doc/developer/Makefile.am b/doc/developer/Makefile.am
index e59d4da..36b80d9 100644
--- a/doc/developer/Makefile.am
+++ b/doc/developer/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.16 2005/01/30 16:01:52 rleigh Exp $
+## $Id: Makefile.am,v 1.18 2005/11/22 14:43:04 rleigh Exp $
 ## Copyright (C) 2001 Andy Stewart and Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
@@ -128,7 +124,7 @@ html-stamp: $(MANUAL_SRC_FILES)
 
 install-data-local: $(STANDARD_TARGETS)
 	if test -n '$(STANDARD_TARGETS)' ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/$(HTMLDIR) ; \
+	  $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/$(HTMLDIR) ; \
 	  if test -f gutenprint.pdf ; then \
 	    $(INSTALL_DATA) gutenprint.pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
 	  elif test -f $(srcdir)/gutenprint.pdf ; then \
diff --git a/doc/developer/Makefile.in b/doc/developer/Makefile.in
index 13fa2cb..2a98d84 100644
--- a/doc/developer/Makefile.in
+++ b/doc/developer/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,13 +53,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -97,7 +97,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -110,14 +109,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -252,13 +249,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -304,8 +296,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MANUAL_SRC_FILES = \
 	copying.xml \
@@ -348,9 +338,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/developer/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps doc/developer/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/developer/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps doc/developer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -584,7 +574,7 @@ html-stamp: $(MANUAL_SRC_FILES)
 
 install-data-local: $(STANDARD_TARGETS)
 	if test -n '$(STANDARD_TARGETS)' ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/$(HTMLDIR) ; \
+	  $(mkdir_p) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/$(HTMLDIR) ; \
 	  if test -f gutenprint.pdf ; then \
 	    $(INSTALL_DATA) gutenprint.pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
 	  elif test -f $(srcdir)/gutenprint.pdf ; then \
diff --git a/doc/developer/gutenprint.pdf b/doc/developer/gutenprint.pdf
index 4e5743e..4d8ad0a 100644
--- a/doc/developer/gutenprint.pdf
+++ b/doc/developer/gutenprint.pdf
diff --git a/doc/developer/reference-html/HTML.manifest b/doc/developer/reference-html/HTML.manifest
deleted file mode 100644
index 731655e..0000000
--- a/doc/developer/reference-html/HTML.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-book1.html
-f14.html
-c39.html
-c48.html
-x67.html
-x79.html
-c194.html
-c200.html
-x271.html
-c464.html
-x955.html
-x1669.html
-c1717.html
-x1734.html
-c1968.html
-gpl.html
-gpl-terms.html
-ln10.html
diff --git a/doc/developer/reference-html/gpl.html b/doc/developer/reference-html/a2122.html
index 92c79e6..df22a8b 100644
--- a/doc/developer/reference-html/gpl.html
+++ b/doc/developer/reference-html/a2122.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >GNU General Public License</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Dithering"
 HREF="c1968.html"><LINK
 REL="NEXT"
 TITLE="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION"
-HREF="gpl-terms.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x2153.html"></HEAD
 ><BODY
 CLASS="appendix"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -53,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="gpl-terms.html"
+HREF="x2153.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -70,31 +73,12 @@ NAME="gpl"
 ></A
 >Appendix A. GNU General Public License</H1
 ><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="gpl.html#gpl-preamble"
->Preamble</A
-></DT
-><DT
-><A
-HREF="gpl-terms.html"
->TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
-></DT
-></DL
-></DIV
-><DIV
 CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
 NAME="gpl-preamble"
->Preamble</A
+>A.1. Preamble</A
 ></H1
 ><P
 >&#13;      The licenses for most software are designed to take away your
@@ -198,7 +182,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -207,7 +191,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="gpl-terms.html"
+HREF="x2153.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
diff --git a/doc/developer/reference-html/c1717.html b/doc/developer/reference-html/c1717.html
index 0d98cde..8e09502 100644
--- a/doc/developer/reference-html/c1717.html
+++ b/doc/developer/reference-html/c1717.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Weaving for inkjet printers</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Appropriate Remote Commands"
 HREF="x1669.html"><LINK
 REL="NEXT"
 TITLE="Weaving algorithms"
-HREF="x1734.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x1734.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -70,37 +73,18 @@ NAME="AEN1717"
 ></A
 >Chapter 6. Weaving for inkjet printers</H1
 ><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="c1717.html#AEN1719"
->Introduction</A
-></DT
-><DT
-><A
-HREF="x1734.html"
->Weaving algorithms</A
-></DT
-></DL
-></DIV
-><DIV
 CLASS="sect1"
 ><H1
 CLASS="sect1"
 ><A
 NAME="AEN1719"
->Introduction</A
+>6.1. Introduction</A
 ></H1
 ><P
 >&#13;      The Epson Stylus Color/Photo printers don't have memory to print
       using all of the nozzles in the print head.  For example, the
       Stylus Photo 700/EX has 32 nozzles.  At 720 dpi, with an 8" wide
-      image, a single line requires ((8 × 720 × 6) / 8)
+      image, a single line requires ((8 × 720 × 6) / 8)
       bytes, or 4320 bytes (because the Stylus Photo printers have 6
       ink colors).  To use 32 nozzles per color would require 138240
       bytes.  It's actually worse than that, though, because the
@@ -115,12 +99,12 @@ NAME="AEN1719"
 ><P
 >&#13;      With the newer (740/750 and later) printers it's even worse,
       since these printers support multiple dot sizes; of course, the
-      even newer 2880×720 printers don't help either.
+      even newer 2880×720 printers don't help either.
     </P
 ><P
 >&#13;      Older Epson printers had a mode called
       MicroWeave<SUP
->â„¢</SUP
+>&#8482;</SUP
 >.  In this mode, the
       host fed the printer individual rows of dots, and the printer
       bundled them up and sent them to the print head in the correct
@@ -128,7 +112,7 @@ NAME="AEN1719"
       in new printers, but in some cases the implementation is very
       minimal: the printer uses exactly one nozzle of each color (the
       first one).  This makes printing extremely slow (more than 30
-      minutes for one 8.5×11" page), although the quality is
+      minutes for one 8.5×11" page), although the quality is
       extremely high with no visible banding whatsoever.  It's not
       good for the print head, though, since no ink is flowing through
       the other nozzles.  This leads to drying of ink and possible
@@ -171,11 +155,11 @@ NAME="AEN1719"
 ><P
 >&#13;      Interestingly, apparently the Windows (and presumably Macintosh)
       drivers for most or all Epson printers still list a
-      “microweave� mode.  Experiments have demonstrated
-      that this does not in fact use the “microweave� mode
+      &#8220;microweave&#8221; mode.  Experiments have demonstrated
+      that this does not in fact use the &#8220;microweave&#8221; mode
       of the printer.  Possibly it does nothing, or it uses a
       different weave pattern from what the
-      “non-microweave� mode does.  This is unnecessarily
+      &#8220;non-microweave&#8221; mode does.  This is unnecessarily
       confusing, at least for people who write drivers who try to
       explain them to people who don't.
     </P
@@ -256,7 +240,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c194.html b/doc/developer/reference-html/c194.html
index 561e519..5ed6bd7 100644
--- a/doc/developer/reference-html/c194.html
+++ b/doc/developer/reference-html/c194.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Reporting Bugs</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Integrating libgutenprint"
 HREF="x79.html"><LINK
 REL="NEXT"
 TITLE="Adding a new printer"
-HREF="c200.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c200.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -126,7 +129,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c1968.html b/doc/developer/reference-html/c1968.html
index ad12784..e03ce26 100644
--- a/doc/developer/reference-html/c1968.html
+++ b/doc/developer/reference-html/c1968.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Dithering</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Weaving algorithms"
 HREF="x1734.html"><LINK
 REL="NEXT"
 TITLE="GNU General Public License"
-HREF="gpl.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="a2122.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -53,7 +56,7 @@ WIDTH="10%"
 ALIGN="right"
 VALIGN="bottom"
 ><A
-HREF="gpl.html"
+HREF="a2122.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
@@ -102,9 +105,9 @@ CLASS="filename"
 CLASS="variablelist"
 ><DL
 ><DT
-><VAR
+><TT
 CLASS="literal"
->dither_fastblack</VAR
+>dither_fastblack</TT
 ></DT
 ><DD
 ><P
@@ -116,9 +119,9 @@ CLASS="literal"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->dither_black</VAR
+>dither_black</TT
 ></DT
 ><DD
 ><P
@@ -129,9 +132,9 @@ CLASS="literal"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->dither_cmyk</VAR
+>dither_cmyk</TT
 ></DT
 ><DD
 ><P
@@ -146,7 +149,7 @@ CLASS="literal"
 ><P
 >&#13;    There is a choice of dithering algorithms.  Four of them are
     based on a basic error diffusion, with a few tweaks of my own.
-    The other one is ‘ordered’.  However, they all share
+    The other one is &#8216;ordered&#8217;.  However, they all share
     the basic operation in common.  First, the algorithm picks what
     kind of dot (if there are multiple dot sizes and/or tones that
     may be picked) is the candidate to be printed.  This decision is
@@ -183,7 +186,7 @@ CLASS="literal"
   </P
 ><P
 >&#13;    Error diffusion works by taking the output error at a given
-    pixel and “diffusing� it into surrounding pixels.
+    pixel and &#8220;diffusing&#8221; it into surrounding pixels.
     Output error is the difference between the amount of ink output
     and the input level at each pixel.  For simple printers, with
     one or four ink colors and only one dot size, the amount of ink
@@ -205,7 +208,7 @@ CLASS="literal"
   </P
 ><P
 >&#13;    There are two sub-classes of error diffusion that we use here,
-    ‘random’ and ‘hybrid’.  One of the
+    &#8216;random&#8217; and &#8216;hybrid&#8217;.  One of the
     techniques that we use to ameliorate the artifacts is to use a
     fuzzy threshold rather than the hard threshold of half of the
     output level.  Random error diffusion uses a pseudo-random
@@ -216,7 +219,7 @@ CLASS="literal"
   </P
 ><P
 >&#13;    There is one additional variant (on both sub-classes), called
-    ‘adaptive hybrid’ and ‘adaptive random’.
+    &#8216;adaptive hybrid&#8217; and &#8216;adaptive random&#8217;.
     The adaptive variant takes advantage of the fact that the
     patterns that ordered dithering create are less visible at very
     low densities, while the artifacts created by error diffusion
@@ -237,7 +240,7 @@ CLASS="literal"
 >&#13;    The next question: how do we handle black when printing in
     color?  Black ink is much darker than colored inks.  It's
     possible to produce black by adding some mixture of cyan,
-    magenta, and yellow—in principle.  In practice, the black
+    magenta, and yellow&#8212;in principle.  In practice, the black
     really isn't very black, and different inks and different papers
     will produce different color casts.  However, by using CMY to
     produce gray, we can output a lot more dots!  This makes for a
@@ -322,7 +325,7 @@ TYPE="1"
 ></LI
 ><LI
 ><P
->&#13;        Compute the “virtual value�.  The virtual value
+>&#13;        Compute the &#8220;virtual value&#8221;.  The virtual value
         is the distance between the value of the lighter and the
         value of the darker ink.  So if the value of the light ink
         is 32768 and the dark ink is 65536, we compute a virtual
@@ -363,7 +366,7 @@ HREF="mailto:ttonino@bio.vu.nl"
     requires careful selection of initial points to achieve good
     results, and is very time consuming.  For best results, a
     different matrix must be used for modes with 2:1 aspect ratio
-    (e.g. 1440×720) than for 1:1 (e. g. 720×720).  It is
+    (e.g. 1440×720) than for 1:1 (e. g. 720×720).  It is
     essential with any of these matrices that every point be used.
     Skipping points generates low-frequency noise.
   </P
@@ -482,16 +485,16 @@ CLASS="emphasis"
 ></LI
 ><LI
 ><P
->&#13;        Oversampling.  This is how to print 1440×720 with Epson
-        Stylus printers.  Printing full density at 1440×720 will
+>&#13;        Oversampling.  This is how to print 1440×720 with Epson
+        Stylus printers.  Printing full density at 1440×720 will
         result in excess ink being laid down.  The trick is to print
         only every other dot.  We still compute the error as though we
         printed every dot.  It turns out that randomizing which dots
         are printed results in very speckled output.  This can be
-        taken too far; oversampling at 1440×1440 or
-        1440×2880 virtual resolution results in other problems.
-        However, at present 1440×1440 (which is more accurately
-        called "1440×720 enhanced", as the Epson printers cannot
+        taken too far; oversampling at 1440×1440 or
+        1440×2880 virtual resolution results in other problems.
+        However, at present 1440×1440 (which is more accurately
+        called "1440×720 enhanced", as the Epson printers cannot
         print 1440 rows per inch) does quite well, although it's slow.
       </P
 ></LI
@@ -816,23 +819,23 @@ CLASS="function"
 CLASS="function"
 >dither_set_X_ranges_simple</CODE
 >
-        (<VAR
+        (<TT
 CLASS="literal"
->X</VAR
-> = <VAR
+>X</TT
+> = <TT
 CLASS="literal"
->c</VAR
+>c</TT
 >,
-        <VAR
+        <TT
 CLASS="literal"
->m</VAR
->, <VAR
+>m</TT
+>, <TT
 CLASS="literal"
->y</VAR
+>y</TT
 > or
-        <VAR
+        <TT
 CLASS="literal"
->k</VAR
+>k</TT
 >) describes the ink choices available
         for each color.  This is useful in typical cases where a
         four color printer with variable dot sizes is in use.  It is
@@ -861,23 +864,23 @@ CLASS="function"
 CLASS="function"
 >dither_set_X_ranges</CODE
 >
-        (<VAR
+        (<TT
 CLASS="literal"
->X</VAR
-> = <VAR
+>X</TT
+> = <TT
 CLASS="literal"
->c</VAR
+>c</TT
 >,
-        <VAR
+        <TT
 CLASS="literal"
->m</VAR
->, <VAR
+>m</TT
+>, <TT
 CLASS="literal"
->y</VAR
+>y</TT
 > or
-        <VAR
+        <TT
 CLASS="literal"
->k</VAR
+>k</TT
 >) describes in a more general way the
         ink choices available for each color.  For each possible ink
         choice, a bit pattern, dot size, value (i. e. relative
@@ -912,7 +915,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -921,7 +924,7 @@ WIDTH="33%"
 ALIGN="right"
 VALIGN="top"
 ><A
-HREF="gpl.html"
+HREF="a2122.html"
 ACCESSKEY="N"
 >Next</A
 ></TD
diff --git a/doc/developer/reference-html/c200.html b/doc/developer/reference-html/c200.html
index ea024f7..cd26eae 100644
--- a/doc/developer/reference-html/c200.html
+++ b/doc/developer/reference-html/c200.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Adding a new printer</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Reporting Bugs"
 HREF="c194.html"><LINK
 REL="NEXT"
 TITLE="The driver file"
-HREF="x271.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x271.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -69,28 +72,6 @@ CLASS="chapter"
 NAME="AEN200"
 ></A
 >Chapter 4. Adding a new printer</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="c200.html#AEN217"
-><TT
-CLASS="filename"
->printers.xml</TT
-></A
-></DT
-><DT
-><A
-HREF="x271.html"
->The driver file</A
-></DT
-></DL
-></DIV
 ><P
 >&#13;    This chapter covers adding a new ESCP/2, PCL, or Canon printer.
     Writing a new driver module is not covered.
@@ -150,7 +131,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN217"
-><TT
+>4.1. <TT
 CLASS="filename"
 >printers.xml</TT
 ></A
@@ -174,12 +155,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN223"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >&#60;printer name="EPSON Stylus Color 1500" driver="escp2-1500"&#62;
@@ -188,33 +163,30 @@ CLASS="programlisting"
 &#60;gamma value="0.597"/&#62;
 &#60;density value="1.0"/&#62;
 &#60;/printer&#62;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;      There are other tags that may be present.  The only ones that
-      are mandatory are <VAR
+      are mandatory are <TT
 CLASS="literal"
->&#60;printer&#62;</VAR
+>&#60;printer&#62;</TT
 >,
-      <VAR
+      <TT
 CLASS="literal"
->&#60;color&#62;</VAR
+>&#60;color&#62;</TT
 > and
-      <VAR
+      <TT
 CLASS="literal"
->&#60;model&#62;</VAR
+>&#60;model&#62;</TT
 >.  The other optional parameters
-      (<VAR
+      (<TT
 CLASS="literal"
->&#60;gamma&#62;</VAR
+>&#60;gamma&#62;</TT
 > and
-      <VAR
+      <TT
 CLASS="literal"
->&#60;density&#62;</VAR
+>&#60;density&#62;</TT
 > in this case) can be used to
       adjust control settings.  This is probably not the right place
       for them; the printer drivers themselves should contain this
@@ -241,75 +213,75 @@ CLASS="variablelist"
 ></P
 ><DL
 ><DT
-><VAR
+><TT
 CLASS="literal"
->&#60;family&#62;</VAR
+>&#60;family&#62;</TT
 ></DT
 ><DD
 ><P
 >&#13;            This defines what driver module this printer uses.  The
-            attribute <VAR
+            attribute <TT
 CLASS="literal"
->name</VAR
+>name</TT
 > is the name of the
             family driver to associate the printers with, for example
-            <VAR
+            <TT
 CLASS="literal"
->escp2</VAR
->, <VAR
+>escp2</TT
+>, <TT
 CLASS="literal"
->pcl</VAR
+>pcl</TT
 >,
-            <VAR
+            <TT
 CLASS="literal"
->canon</VAR
->, <VAR
+>canon</TT
+>, <TT
 CLASS="literal"
->ps</VAR
+>ps</TT
 > or
-            <VAR
+            <TT
 CLASS="literal"
->raw</VAR
+>raw</TT
 >.  This tag may only contain
-            <VAR
+            <TT
 CLASS="literal"
->&#60;printer&#62;</VAR
+>&#60;printer&#62;</TT
 > elements.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->&#60;printer&#62;</VAR
+>&#60;printer&#62;</TT
 ></DT
 ><DD
 ><P
 >&#13;            This starts the definition of a printer.  It must contain
-            the attributes <VAR
+            the attributes <TT
 CLASS="literal"
->name</VAR
+>name</TT
 > and
-            <VAR
+            <TT
 CLASS="literal"
->driver</VAR
->.  <VAR
+>driver</TT
+>.  <TT
 CLASS="literal"
->name</VAR
+>name</TT
 > should
             be is the full name of the printer, and must be human
-            readable.  <VAR
+            readable.  <TT
 CLASS="literal"
->driver</VAR
+>driver</TT
 > should consist of
             alphanumerics and hyphens, and be fairly short.
-            <VAR
+            <TT
 CLASS="literal"
->name</VAR
+>name</TT
 > is what will appear in the
             user-visible listing of printers, and may be translated
-            into the user's language, while <VAR
+            into the user's language, while <TT
 CLASS="literal"
->driver</VAR
+>driver</TT
 >
             is what is actually used to key into the list of printers.
             It is legal to have multiple printers with the same driver
@@ -317,43 +289,43 @@ CLASS="literal"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->&#60;color&#62;</VAR
+>&#60;color&#62;</TT
 ></DT
 ><DD
 ><P
 >&#13;            This tag may not contain any content, but the
-            <VAR
+            <TT
 CLASS="literal"
->value</VAR
+>value</TT
 > attribute may be set to
-            <VAR
+            <TT
 CLASS="literal"
->true</VAR
-> or <VAR
+>true</TT
+> or <TT
 CLASS="literal"
->false</VAR
+>false</TT
 >.  This
             indicates that this printer is capable of color, or is not
             capable of color respectively.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->&#60;model&#62;</VAR
+>&#60;model&#62;</TT
 ></DT
 ><DD
 ><P
 >&#13;            This defines a model number.  This tag may not contain any
-            content, but the <VAR
+            content, but the <TT
 CLASS="literal"
->value</VAR
+>value</TT
 > attribute may be
             set to a positive integer.  This is passed into the
             driver, which may do whatever it cares to with
-            it—index into a table, compute on, or whatever.
+            it&#8212;index into a table, compute on, or whatever.
             This need not be unique.
           </P
 ></DD
@@ -386,7 +358,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c39.html b/doc/developer/reference-html/c39.html
index 04c08a9..3021576 100644
--- a/doc/developer/reference-html/c39.html
+++ b/doc/developer/reference-html/c39.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Copying, modification and redistribution</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Preface"
 HREF="f14.html"><LINK
 REL="NEXT"
 TITLE="Using libgutenprint"
-HREF="c48.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c48.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -111,7 +114,7 @@ CLASS="emphasis"
 ><P
 >&#13;    Gutenprint is licensed under the terms of the GNU General Public
     License (GPL), reproduced in <A
-HREF="gpl.html"
+HREF="a2122.html"
 >Appendix A</A
 >.
   </P
@@ -141,7 +144,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c464.html b/doc/developer/reference-html/c464.html
index 5d5fc45..cb3bede 100644
--- a/doc/developer/reference-html/c464.html
+++ b/doc/developer/reference-html/c464.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >ESC/P2</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="The driver file"
 HREF="x271.html"><LINK
 REL="NEXT"
 TITLE="Remote Mode Commands"
-HREF="x955.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x955.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -69,30 +72,6 @@ CLASS="chapter"
 NAME="AEN464"
 ></A
 >Chapter 5. ESC/P2</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="c464.html#AEN477"
->Standard commands</A
-></DT
-><DT
-><A
-HREF="x955.html"
->Remote Mode Commands</A
-></DT
-><DT
-><A
-HREF="x1669.html"
->Appropriate Remote Commands</A
-></DT
-></DL
-></DIV
 ><P
 >&#13;    This is a description of the ESC/P2 raster commands used by the
     Gutenprint printer driver, which is a subset of the complete
@@ -114,29 +93,29 @@ CLASS="emphasis"
     are certainly not complete.
   </P
 ><P
->&#13;    All ESCP/2 raster commands begin with the <VAR
+>&#13;    All ESCP/2 raster commands begin with the <TT
 CLASS="literal"
->ESC</VAR
+>ESC</TT
 >
     character (0x1b), followed by either one or two command characters
     and arguments where applicable.  Older commands generally have one
     command character.  Newer commands usually have a
-    ‘<VAR
+    &#8216;<TT
 CLASS="literal"
->(</VAR
->’ (left parenthesis) followed by
+>(</TT
+>&#8217; (left parenthesis) followed by
     a command character and a byte count for the arguments that
     follow.  The byte count is a 16-bit (2 byte) binary integer, in
     little endian order.
   </P
 ><P
 >&#13;    All arguments listed here are of the form
-    <VAR
+    <TT
 CLASS="literal"
->name[bytes]</VAR
-> where <VAR
+>name[bytes]</TT
+> where <TT
 CLASS="literal"
->[bytes]</VAR
+>[bytes]</TT
 > is
     the number of bytes that comprise the argument.  The arguments
     themselves are usually one, two, or four byte integers, always
@@ -154,7 +133,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN477"
->Standard commands</A
+>5.1. Standard commands</A
 ></H1
 ><P
 ></P
@@ -166,9 +145,9 @@ CLASS="variablelist"
 ></P
 ><DL
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC @</VAR
+>ESC @</TT
 ></DT
 ><DD
 ><P
@@ -178,22 +157,22 @@ CLASS="literal"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (G <VAR
+>ESC (G <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            <VAR
+            <CODE
 CLASS="varname"
->ON1</VAR
-></VAR
+>ON1</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Turn on graphics mode.  <VAR
+>&#13;            Turn on graphics mode.  <CODE
 CLASS="varname"
->ON</VAR
+>ON</CODE
 > should be
             <CODE
 CLASS="constant"
@@ -202,31 +181,31 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (U <VAR
+>ESC (U <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            <VAR
+            <CODE
 CLASS="varname"
->UNIT1</VAR
-></VAR
+>UNIT1</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set basic unit of measurement used by printer.  This is
             expressed in multiples of 1/3600".  At 720 DPI,
-            <VAR
+            <CODE
 CLASS="varname"
->UNIT</VAR
+>UNIT</CODE
 > is <CODE
 CLASS="constant"
 >5</CODE
 >; at
-            360 DPI, <VAR
+            360 DPI, <CODE
 CLASS="varname"
->UNIT</VAR
+>UNIT</CODE
 > is
             <CODE
 CLASS="constant"
@@ -235,88 +214,88 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (U <VAR
+>ESC (U <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=5
-            <VAR
+            <CODE
 CLASS="varname"
->PAGEUNITS1</VAR
-> <VAR
+>PAGEUNITS1</CODE
+> <CODE
 CLASS="varname"
->VUNIT1</VAR
+>VUNIT1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->HUNIT1</VAR
+>HUNIT1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->BASEUNIT2</VAR
-></VAR
+>BASEUNIT2</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set basic units of measurement used by the printer.
-            <VAR
+            <CODE
 CLASS="varname"
->PAGEUNIT</VAR
+>PAGEUNIT</CODE
 > is the unit of page
             measurement (for commands that set page dimensions and
-            the like).  <VAR
+            the like).  <CODE
 CLASS="varname"
->VUNIT</VAR
+>VUNIT</CODE
 > is the unit of
             vertical measurement (for vertical movement commands).
-            <VAR
+            <CODE
 CLASS="varname"
->HUNIT</VAR
+>HUNIT</CODE
 > is the unit of horizontal
             movement (for horizontal positioning commands).  All of
             these units are expressed in
-            <VAR
+            <CODE
 CLASS="varname"
->BASEUNIT</VAR
+>BASEUNIT</CODE
 >, which is in reciprocal
-            inches.  Typically, <VAR
+            inches.  Typically, <CODE
 CLASS="varname"
->BASEUNIT</VAR
+>BASEUNIT</CODE
 > is
             <CODE
 CLASS="constant"
 >1440</CODE
 >.  In 720 DPI mode,
-            <VAR
+            <CODE
 CLASS="varname"
->PAGEUNIT</VAR
->, <VAR
+>PAGEUNIT</CODE
+>, <CODE
 CLASS="varname"
->VUNIT</VAR
+>VUNIT</CODE
 >,
-            and <VAR
+            and <CODE
 CLASS="varname"
->HUNIT</VAR
+>HUNIT</CODE
 > are all
             <CODE
 CLASS="constant"
 >2</CODE
->; in 1440×720 DPI mode,
-            <VAR
+>; in 1440×720 DPI mode,
+            <CODE
 CLASS="varname"
->PAGEUNIT</VAR
-> and <VAR
+>PAGEUNIT</CODE
+> and <CODE
 CLASS="varname"
->VUNIT</VAR
+>VUNIT</CODE
 >
             are normally set to <CODE
 CLASS="constant"
 >2</CODE
 >;
-            <VAR
+            <CODE
 CLASS="varname"
->HUNIT</VAR
+>HUNIT</CODE
 > is set to
             <CODE
 CLASS="constant"
@@ -325,20 +304,20 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (K <VAR
+>ESC (K <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2
-            <VAR
+            <CODE
 CLASS="varname"
->ZERO1</VAR
+>ZERO1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->GRAYMODE1</VAR
-></VAR
+>GRAYMODE1</CODE
+></TT
 ></DT
 ><DD
 ><P
@@ -347,9 +326,9 @@ CLASS="varname"
             identified because they are advertised as having more
             black nozzles than nozzles of individual colors.
             Setting grayscale mode allows use of these extra nozzles
-            for faster printing.  <VAR
+            for faster printing.  <CODE
 CLASS="varname"
->GRAYMODE</VAR
+>GRAYMODE</CODE
 > should
             be <CODE
 CLASS="constant"
@@ -362,9 +341,9 @@ CLASS="constant"
 CLASS="constant"
 >1</CODE
 > for grayscale.
-            <VAR
+            <CODE
 CLASS="varname"
->ZERO</VAR
+>ZERO</CODE
 > should always be
             <CODE
 CLASS="constant"
@@ -373,22 +352,22 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (i <VAR
+>ESC (i <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            <VAR
+            <CODE
 CLASS="varname"
->MICROWEAVE1</VAR
-></VAR
+>MICROWEAVE1</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            If <VAR
+>&#13;            If <CODE
 CLASS="varname"
->MICROWEAVE</VAR
+>MICROWEAVE</CODE
 > is
             <CODE
 CLASS="constant"
@@ -397,7 +376,7 @@ CLASS="constant"
             printers, this is used to turn on microweave; on newer
             printers, it prints one row at a time.  All printers
             support this mode.  It should only be used at 720 (or
-            1440×720) DPI.  The Epson Stylus Pro series
+            1440×720) DPI.  The Epson Stylus Pro series
             indicates additional modes:
           </P
 ><P
@@ -412,7 +391,7 @@ CLASS="constant"
 ></DT
 ><DD
 ><P
->&#13;                  “Full-overlap�
+>&#13;                  &#8220;Full-overlap&#8221;
                 </P
 ></DD
 ><DT
@@ -422,7 +401,7 @@ CLASS="constant"
 ></DT
 ><DD
 ><P
->&#13;                  “Four-pass�
+>&#13;                  &#8220;Four-pass&#8221;
                 </P
 ></DD
 ><DT
@@ -432,7 +411,7 @@ CLASS="constant"
 ></DT
 ><DD
 ><P
->&#13;                  “Full-overlap 2�
+>&#13;                  &#8220;Full-overlap 2&#8221;
                 </P
 ></DD
 ></DL
@@ -450,19 +429,19 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
 >ESC U
-            <VAR
+            <CODE
 CLASS="varname"
->DIRECTION1</VAR
-></VAR
+>DIRECTION1</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            If <VAR
+>&#13;            If <CODE
 CLASS="varname"
->DIRECTION</VAR
+>DIRECTION</CODE
 > is
             <CODE
 CLASS="constant"
@@ -475,31 +454,31 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (s <VAR
+>ESC (s <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            <VAR
+            <CODE
 CLASS="varname"
->SPEED1</VAR
-></VAR
+>SPEED1</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            On some older printers, this controls the print head
-            speed.  <VAR
+            speed.  <CODE
 CLASS="varname"
->SPEED</VAR
+>SPEED</CODE
 > of
             <CODE
 CLASS="constant"
 >2</CODE
 > is 10 inches/sec;
-            <VAR
+            <CODE
 CLASS="varname"
->SPEED</VAR
+>SPEED</CODE
 > of <CODE
 CLASS="constant"
 >0</CODE
@@ -508,26 +487,26 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (e <VAR
+>ESC (e <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2
-            <VAR
+            <CODE
 CLASS="varname"
->ZERO1</VAR
+>ZERO1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->DOTSIZE1</VAR
-></VAR
+>DOTSIZE1</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Choose print dotsize.  <VAR
+>&#13;            Choose print dotsize.  <CODE
 CLASS="varname"
->DOTSIZE</VAR
+>DOTSIZE</CODE
 > can
             take on various values, depending upon the printer.
             Almost all printers support <CODE
@@ -538,45 +517,45 @@ CLASS="constant"
 CLASS="constant"
 >2</CODE
 >.  Variable dot size printers
-            allow a value of <VAR
+            allow a value of <CODE
 CLASS="varname"
->16</VAR
+>16</CODE
 >.  Other than the
-            value of <VAR
+            value of <CODE
 CLASS="varname"
->16</VAR
+>16</CODE
 >, this appears to be
             ignored at resolutions of 720 DPI and above.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (C <VAR
+>ESC (C <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2
-            <VAR
+            <CODE
 CLASS="varname"
->PAGELENGTH2</VAR
-></VAR
->, <VAR
+>PAGELENGTH2</CODE
+></TT
+>, <TT
 CLASS="literal"
->ESC (C <VAR
+>ESC (C <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->PAGELENGTH4</VAR
-></VAR
+>PAGELENGTH4</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set the length of the page in “pageunits�
-            (see <VAR
+>&#13;            Set the length of the page in &#8220;pageunits&#8221;
+            (see <TT
 CLASS="literal"
->ESC (U</VAR
+>ESC (U</TT
 > above).  The second form
             of the command allows setting of longer page lengths on
             new printers (these happen to be the printers that
@@ -584,41 +563,41 @@ CLASS="literal"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (c <VAR
+>ESC (c <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->TOP2</VAR
+>TOP2</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->LENGTH2</VAR
-></VAR
->, <VAR
+>LENGTH2</CODE
+></TT
+>, <TT
 CLASS="literal"
->ESC (c <VAR
+>ESC (c <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=8
-            <VAR
+            <CODE
 CLASS="varname"
->TOP4</VAR
+>TOP4</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->LENGTH4</VAR
-></VAR
+>LENGTH4</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set the vertical page margins of the page in
-            “pageunits� (see <VAR
+            &#8220;pageunits&#8221; (see <TT
 CLASS="literal"
->ESC (U</VAR
+>ESC (U</TT
 >
             above).  The margins are specified as the top of the
             page and the length of the page.  The second form of the
@@ -628,119 +607,119 @@ CLASS="literal"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (S <VAR
+>ESC (S <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=8
-            <VAR
+            <CODE
 CLASS="varname"
->WIDTH4</VAR
+>WIDTH4</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->LENGTH4</VAR
-></VAR
+>LENGTH4</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set the width and length of the printed page region in
-            “pageunits� (see <VAR
+            &#8220;pageunits&#8221; (see <TT
 CLASS="literal"
->ESC (U</VAR
+>ESC (U</TT
 >
             above).
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (v <VAR
+>ESC (v <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2
-            <VAR
+            <CODE
 CLASS="varname"
->ADVANCE2</VAR
-></VAR
->, <VAR
+>ADVANCE2</CODE
+></TT
+>, <TT
 CLASS="literal"
->ESC (v <VAR
+>ESC (v <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->ADVANCE4</VAR
-></VAR
+>ADVANCE4</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Feed vertically <VAR
+>&#13;            Feed vertically <CODE
 CLASS="varname"
->ADVANCE</VAR
+>ADVANCE</CODE
 >
-            “vertical units� (see <VAR
+            &#8220;vertical units&#8221; (see <TT
 CLASS="literal"
 >ESC
-            (U</VAR
+            (U</TT
 > above) from the current print head
             position.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (V <VAR
+>ESC (V <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2
-            <VAR
+            <CODE
 CLASS="varname"
->ADVANCE2</VAR
-></VAR
->, <VAR
+>ADVANCE2</CODE
+></TT
+>, <TT
 CLASS="literal"
->ESC (V <VAR
+>ESC (V <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->ADVANCE4</VAR
-></VAR
+>ADVANCE4</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Feed vertically <VAR
+>&#13;            Feed vertically <CODE
 CLASS="varname"
->ADVANCE</VAR
+>ADVANCE</CODE
 >
-            “vertical units� (see <VAR
+            &#8220;vertical units&#8221; (see <TT
 CLASS="literal"
 >ESC
-            (U</VAR
+            (U</TT
 > above) from the top margin.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC ($ <VAR
+>ESC ($ <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->OFFSET4</VAR
-></VAR
+>OFFSET4</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set horizontal position to <VAR
+>&#13;            Set horizontal position to <CODE
 CLASS="varname"
->OFFSET</VAR
+>OFFSET</CODE
 >
             from the left margin.  This command operates on printers
             of the 740 class and newer (all printers with variable
@@ -748,19 +727,19 @@ CLASS="varname"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
 >ESC $
-            <VAR
+            <CODE
 CLASS="varname"
->OFFSET2</VAR
-></VAR
+>OFFSET2</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set horizontal position to <VAR
+>&#13;            Set horizontal position to <CODE
 CLASS="varname"
->OFFSET</VAR
+>OFFSET</CODE
 >
             from the left margin.  This command operates on printers
             of the 740 class and newer (all printers with variable
@@ -768,34 +747,34 @@ CLASS="varname"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (\ <VAR
+>ESC (\ <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->UNITS2</VAR
+>UNITS2</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->OFFSET2</VAR
-></VAR
+>OFFSET2</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set horizontal position to <VAR
+>&#13;            Set horizontal position to <CODE
 CLASS="varname"
->OFFSET</VAR
+>OFFSET</CODE
 >
             from the previous print head position, measured in
-            <VAR
+            <CODE
 CLASS="varname"
->UNITS</VAR
->.  <VAR
+>UNITS</CODE
+>.  <CODE
 CLASS="varname"
->UNITS</VAR
+>UNITS</CODE
 > is
             measured in inverse inches, and should be set to 1440 in
             all cases.  This operates on all 1440 dpi printers that
@@ -803,58 +782,58 @@ CLASS="varname"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (/ <VAR
+>ESC (/ <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->OFFSET4</VAR
-></VAR
+>OFFSET4</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set horizontal position to <VAR
+>&#13;            Set horizontal position to <CODE
 CLASS="varname"
->OFFSET</VAR
+>OFFSET</CODE
 >
             from the previous print head position, measured in
-            “horizontal units� (see <VAR
+            &#8220;horizontal units&#8221; (see <TT
 CLASS="literal"
 >ESC
-            (U</VAR
+            (U</TT
 > above).  This operates on all variable dot
             size printers.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
 >ESC \
-            <VAR
+            <CODE
 CLASS="varname"
->OFFSET2</VAR
-></VAR
+>OFFSET2</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set horizontal position to <VAR
+>&#13;            Set horizontal position to <CODE
 CLASS="varname"
->OFFSET</VAR
+>OFFSET</CODE
 >
             from the previous print head position, measured in basic
-            unit of measurement (see <VAR
+            unit of measurement (see <TT
 CLASS="literal"
->ESC (U</VAR
+>ESC (U</TT
 >
             above). This is used on all 720 dpi printers, and can
             also be used on 1440 dpi printers in lower resolutions
             to save a few bytes.  Note that
-            <VAR
+            <CODE
 CLASS="varname"
->OFFSET</VAR
+>OFFSET</CODE
 > may be negative.  The range of
             values for this command is between
             <CODE
@@ -868,35 +847,35 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
 >ESC r
-            <VAR
+            <CODE
 CLASS="varname"
->COLOR1</VAR
-></VAR
->, <VAR
+>COLOR1</CODE
+></TT
+>, <TT
 CLASS="literal"
->ESC (r <VAR
+>ESC (r <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2
-            <VAR
+            <CODE
 CLASS="varname"
->DENSITY1</VAR
+>DENSITY1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->COLOR1</VAR
-></VAR
+>COLOR1</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set the ink color.  The first form is used on four-color
             printers; the second on six-color printers.
-            <VAR
+            <CODE
 CLASS="varname"
->DENSITY</VAR
+>DENSITY</CODE
 > is <CODE
 CLASS="constant"
 >0</CODE
@@ -905,9 +884,9 @@ CLASS="constant"
 CLASS="constant"
 >1</CODE
 > for light.
-            <VAR
+            <CODE
 CLASS="varname"
->COLOR</VAR
+>COLOR</CODE
 > is
           </P
 ><DIV
@@ -929,9 +908,9 @@ WIDTH="1*"
 TITLE="color"><THEAD
 ><TR
 ><TH
-><VAR
+><CODE
 CLASS="varname"
->COLOR</VAR
+>COLOR</CODE
 ></TH
 ><TH
 >Color name</TH
@@ -983,33 +962,33 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC . <VAR
+>ESC . <CODE
 CLASS="varname"
->COMPRESS1</VAR
+>COMPRESS1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->VSEP1</VAR
-> <VAR
+>VSEP1</CODE
+> <CODE
 CLASS="varname"
->HSEP1</VAR
+>HSEP1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->LINES1</VAR
-> <VAR
+>LINES1</CODE
+> <CODE
 CLASS="varname"
->WIDTH2</VAR
+>WIDTH2</CODE
 >
-            data...</VAR
+            data...</TT
 ></DT
 ><DD
 ><P
->&#13;            Print data.  <VAR
+>&#13;            Print data.  <CODE
 CLASS="varname"
->COMPRESS</VAR
+>COMPRESS</CODE
 > signifies the
             compression mode.
           </P
@@ -1032,9 +1011,9 @@ WIDTH="1*"
 TITLE="compression"><THEAD
 ><TR
 ><TH
-><VAR
+><CODE
 CLASS="varname"
->COMPRESS</VAR
+>COMPRESS</CODE
 ></TH
 ><TH
 >Compression mode</TH
@@ -1058,7 +1037,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    TIFF compression (incorrectly documented as
-                    “run length encoded�)
+                    &#8220;run length encoded&#8221;)
                   </TD
 ></TR
 ><TR
@@ -1075,9 +1054,9 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->VSEP</VAR
+>VSEP</CODE
 > depends upon resolution and
             printer type.  At 360 DPI, it is always
             <CODE
@@ -1091,13 +1070,13 @@ CLASS="constant"
             <CODE
 CLASS="constant"
 >40</CODE
-> (8 × 5}).  On some other
+> (8 × 5}).  On some other
             printers, it varies.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->HSEP1</VAR
+>HSEP1</CODE
 > is <CODE
 CLASS="constant"
 >10</CODE
@@ -1111,9 +1090,9 @@ CLASS="constant"
             1/720").
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->LINES</VAR
+>LINES</CODE
 > is the number of lines to be
             printed.  It should be <CODE
 CLASS="constant"
@@ -1123,18 +1102,18 @@ CLASS="constant"
             be the number of lines to be actually printed.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->WIDTH</VAR
+>WIDTH</CODE
 > is the number of pixels to be
             printed in each row.  Following this command, a carriage
             return (<CODE
 CLASS="constant"
 >13</CODE
 > decimal,
-            <VAR
+            <TT
 CLASS="literal"
->0A</VAR
+>0A</TT
 > hex) should be output to return
             the print head position to the left margin.
           </P
@@ -1184,35 +1163,35 @@ CLASS="constant"
 ></OL
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC i <VAR
+>ESC i <CODE
 CLASS="varname"
->COLOR1</VAR
+>COLOR1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->COMPRESS1</VAR
-> <VAR
+>COMPRESS1</CODE
+> <CODE
 CLASS="varname"
->BITS1</VAR
+>BITS1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->BYTES2</VAR
-> <VAR
+>BYTES2</CODE
+> <CODE
 CLASS="varname"
->LINES2</VAR
+>LINES2</CODE
 >
-            data...</VAR
+            data...</TT
 ></DT
 ><DD
 ><P
 >&#13;            Print data in the newer printers (that support variable
             dot size), and Stylus Pro models.
-            <VAR
+            <CODE
 CLASS="varname"
->COLOR</VAR
+>COLOR</CODE
 > is the color.
           </P
 ><DIV
@@ -1234,9 +1213,9 @@ WIDTH="1*"
 TITLE="color"><THEAD
 ><TR
 ><TH
-><VAR
+><CODE
 CLASS="varname"
->COLOR</VAR
+>COLOR</CODE
 ></TH
 ><TH
 >Color name</TH
@@ -1304,7 +1283,7 @@ CLASS="constant"
 >16</CODE
 ></TD
 ><TD
->Gray (“light black�)</TD
+>Gray (&#8220;light black&#8221;)</TD
 ></TR
 ><TR
 ><TD
@@ -1328,9 +1307,9 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->COMPRESS</VAR
+>COMPRESS</CODE
 > signifies the compression
             mode:
           </P
@@ -1353,9 +1332,9 @@ WIDTH="1*"
 TITLE="compression"><THEAD
 ><TR
 ><TH
-><VAR
+><CODE
 CLASS="varname"
->COMPRESS</VAR
+>COMPRESS</CODE
 ></TH
 ><TH
 >Compression mode</TH
@@ -1379,7 +1358,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    TIFF compression (incorrectly documented as
-                    “run length encoded�)
+                    &#8220;run length encoded&#8221;)
                   </TD
 ></TR
 ><TR
@@ -1390,7 +1369,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    TIFF compression with a special command set, or
-                    “run length encoding 2� on some
+                    &#8220;run length encoding 2&#8221; on some
                     printers.
                   </TD
 ></TR
@@ -1398,27 +1377,27 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->BITS</VAR
+>BITS</CODE
 > is the number of bits per pixel.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->BYTES</VAR
+>BYTES</CODE
 > is the number of bytes wide for
-            each row (ceiling(BITS × width_of_row, 8)}). Note
-            that this is different from the <VAR
+            each row (ceiling(BITS × width_of_row, 8)}). Note
+            that this is different from the <TT
 CLASS="literal"
->ESC .</VAR
+>ESC .</TT
 >
             command above.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->LINES</VAR
+>LINES</CODE
 > is the number of lines to be
             printed.  This command is the only way to get variable
             dot size printing.  In variable dot mode, the size of
@@ -1437,23 +1416,23 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (D <VAR
+>ESC (D <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4
-            <VAR
+            <CODE
 CLASS="varname"
->BASE2</VAR
-> <VAR
+>BASE2</CODE
+> <CODE
 CLASS="varname"
->VERTICAL1</VAR
+>VERTICAL1</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->HORIZONTAL1</VAR
-></VAR
+>HORIZONTAL1</CODE
+></TT
 ></DT
 ><DD
 ><P
@@ -1462,9 +1441,9 @@ CLASS="varname"
             (and possibly other high end printers).
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->BASE</VAR
+>BASE</CODE
 > is the base unit for this
             command; it must be <CODE
 CLASS="constant"
@@ -1472,42 +1451,42 @@ CLASS="constant"
 >.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->VERTICAL</VAR
+>VERTICAL</CODE
 > is the distance in these
             units between printed rows; it should be
-            ((separation_in_nozzles × <VAR
+            ((separation_in_nozzles × <CODE
 CLASS="varname"
->BASE</VAR
+>BASE</CODE
 >
-            ÷ 720).
+            ÷ 720).
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->HORIZONTAL</VAR
+>HORIZONTAL</CODE
 > is the horizontal
             separation between dots in a row.  Depending upon the
-            printer, this should be either (14400 ÷ 720) or
-            (14400 ÷ 360).  The Stylus Pro 9000 manual
+            printer, this should be either (14400 ÷ 720) or
+            (14400 ÷ 360).  The Stylus Pro 9000 manual
             suggests that the settings should match the chosen
             resolution, but that is apparently not the case (or not
             always the case) on other printers.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC (R <VAR
+>ESC (R <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=8 00 R E M O T E
-            1</VAR
+            1</TT
 ></DT
 ><DD
 ><P
->&#13;            Enters “remote mode�.  This is a special,
+>&#13;            Enters &#8220;remote mode&#8221;.  This is a special,
             undocumented command set that is used to set up various
             printer options, such as paper feed tray, and perform
             utility functions such as head cleaning and alignment.
@@ -1518,9 +1497,9 @@ CLASS="varname"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->ESC 01 @EJL [sp] ID\r\n</VAR
+>ESC 01 @EJL [sp] ID\r\n</TT
 ></DT
 ><DD
 ><P
@@ -1535,12 +1514,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN937"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >@EJL ID\r
@@ -1550,9 +1523,6 @@ MDL:[printer model];
 CLS:PRINTER;
 DES:EPSON [printer model];
 \f</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1578,19 +1548,10 @@ CLASS="informalexample"
 ><A
 NAME="AEN941"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >ESC 01@EJL[space]1284.4[newline]@EJL[space][space][space][space]
 [space][newline]ESC@</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1604,12 +1565,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN944"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >magic command
@@ -1627,9 +1582,6 @@ ESC (c
 ESC (S
 ESC (D (if needed)
 ESC (V (optional -- this can be accomplished with ESC (v)</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1643,18 +1595,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN947"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >ESC (v</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1668,21 +1611,12 @@ CLASS="informalexample"
 ><A
 NAME="AEN950"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >ESC ($ or ESC (\ or ESC \
 ESC (r or ESC r (if needed---not used with "ESC i" and not needed if the color
 has not changed from the previous printed line)
 ESC . or ESC i  ...data... [return] (0A hex)</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1696,19 +1630,10 @@ CLASS="informalexample"
 ><A
 NAME="AEN953"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >[formfeed] (0C hex)
 ESC @</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1739,7 +1664,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/c48.html b/doc/developer/reference-html/c48.html
index a09caa6..3e4767b 100644
--- a/doc/developer/reference-html/c48.html
+++ b/doc/developer/reference-html/c48.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Using libgutenprint</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="Copying, modification and redistribution"
 HREF="c39.html"><LINK
 REL="NEXT"
 TITLE="Linking with libgutenprint"
-HREF="x67.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x67.html"></HEAD
 ><BODY
 CLASS="chapter"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -69,30 +72,6 @@ CLASS="chapter"
 NAME="AEN48"
 ></A
 >Chapter 2. Using libgutenprint</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="c48.html#AEN51"
->Code prerequisites</A
-></DT
-><DT
-><A
-HREF="x67.html"
->Linking with libgutenprint</A
-></DT
-><DT
-><A
-HREF="x79.html"
->Integrating libgutenprint</A
-></DT
-></DL
-></DIV
 ><P
 >&#13;    This chapter describes how to write programs that use
     libgutenprint.
@@ -103,7 +82,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN51"
->Code prerequisites</A
+>2.1. Code prerequisites</A
 ></H1
 ><P
 >&#13;      To use libgutenprint with a program, several steps must be taken:
@@ -121,18 +100,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN57"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >&#60;gimp-print/gimp-print.h&#62;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -165,12 +135,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN65"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >#include &#60;gimp-print/gimp-print.h&#62;
@@ -181,9 +145,6 @@ main (int argc, char *argv[])
   return 0;
 }
       </PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -214,7 +175,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/docbook.css b/doc/developer/reference-html/docbook.css
deleted file mode 100644
index 0f90516..0000000
--- a/doc/developer/reference-html/docbook.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.NAVHEADER { display: none }
-.NAVFOOTER { display: none }
-.TOC       { display: none }
-
-.NAVTOC    { margin-left: 15;
-             display: none }
-
-.NAVBTN    { font-size: 10pt }
-
-.TOCTITLE  { font-size: 10pt;
-             color: blue;
- 	     text-decoration: underline; }
diff --git a/doc/developer/reference-html/f14.html b/doc/developer/reference-html/f14.html
index d234b7a..203891e 100644
--- a/doc/developer/reference-html/f14.html
+++ b/doc/developer/reference-html/f14.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Preface</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="PREVIOUS"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="NEXT"
 TITLE="Copying, modification and redistribution"
-HREF="c39.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c39.html"></HEAD
 ><BODY
 CLASS="preface"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -39,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -77,7 +80,7 @@ NAME="AEN14"
     on a par with proprietary vendor-supplied drivers in many cases,
     and can be used for many of the most demanding printing tasks,
     especially for high quality printing on modern inkjets, including
-    “photographic quality� models which offer very high
+    &#8220;photographic quality&#8221; models which offer very high
     resolutions and several inks.  The core of Gutenprint is a shared
     library (libgutenprint) which may be used by any program that
     wishes to produce high-quality printed output.
@@ -158,7 +161,7 @@ CLASS="command"
 >&#13;    <P
 CLASS="literallayout"
 >We&nbsp;hope&nbsp;you&nbsp;enjoy&nbsp;using&nbsp;Gutenprint!<br>
-—The&nbsp;Gutenprint&nbsp;project<br>
+&#8212;The&nbsp;Gutenprint&nbsp;project<br>
 &nbsp;&nbsp;&nbsp;&nbsp;</P
 >
   </P
@@ -179,7 +182,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -188,7 +191,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/book1.html b/doc/developer/reference-html/index.html
index 34715a9..0c894e7 100644
--- a/doc/developer/reference-html/book1.html
+++ b/doc/developer/reference-html/index.html
@@ -1,18 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >The Developer's Guide to Gutenprint</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="NEXT"
 TITLE="Preface"
-HREF="f14.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="f14.html"></HEAD
 ><BODY
 CLASS="book"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="BOOK"
 ><A
@@ -32,10 +35,35 @@ CLASS="corpauthor"
   </H3
 ><P
 CLASS="copyright"
+>Copyright &copy; 2003 The Gutenprint Project</P
+><DIV
+CLASS="legalnotice"
+><P
+></P
 ><A
-HREF="ln10.html"
->Copyright</A
-> &copy; 2003 The Gutenprint Project</P
+NAME="AEN10"
+></A
+><P
+>&#13;      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.
+    </P
+><P
+>&#13;      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.
+    </P
+><P
+>&#13;      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.
+    </P
+><P
+></P
+></DIV
 ><HR></DIV
 ><DIV
 CLASS="TOC"
@@ -62,24 +90,24 @@ HREF="c48.html"
 ><DD
 ><DL
 ><DT
-><A
+>2.1. <A
 HREF="c48.html#AEN51"
 >Code prerequisites</A
 ></DT
 ><DT
-><A
+>2.2. <A
 HREF="x67.html"
 >Linking with libgutenprint</A
 ></DT
 ><DT
-><A
+>2.3. <A
 HREF="x79.html"
 >Integrating libgutenprint</A
 ></DT
 ><DD
 ><DL
 ><DT
-><A
+>2.3.1. <A
 HREF="x79.html#AEN86"
 ><B
 CLASS="command"
@@ -87,7 +115,7 @@ CLASS="command"
 ></A
 ></DT
 ><DT
-><A
+>2.3.2. <A
 HREF="x79.html#AEN123"
 ><B
 CLASS="command"
@@ -95,7 +123,7 @@ CLASS="command"
 ></A
 ></DT
 ><DT
-><A
+>2.3.3. <A
 HREF="x79.html#AEN133"
 ><B
 CLASS="command"
@@ -103,7 +131,7 @@ CLASS="command"
 ></A
 ></DT
 ><DT
-><A
+>2.3.4. <A
 HREF="x79.html#AEN150"
 ><B
 CLASS="command"
@@ -127,7 +155,7 @@ HREF="c200.html"
 ><DD
 ><DL
 ><DT
-><A
+>4.1. <A
 HREF="c200.html#AEN217"
 ><TT
 CLASS="filename"
@@ -135,24 +163,24 @@ CLASS="filename"
 ></A
 ></DT
 ><DT
-><A
+>4.2. <A
 HREF="x271.html"
 >The driver file</A
 ></DT
 ><DD
 ><DL
 ><DT
-><A
+>4.2.1. <A
 HREF="x271.html#AEN281"
 >Epson inkjet printers</A
 ></DT
 ><DT
-><A
+>4.2.2. <A
 HREF="x271.html#AEN403"
 >Tuning the printer</A
 ></DT
 ><DT
-><A
+>4.2.3. <A
 HREF="x271.html#AEN433"
 >Canon inkjet printers</A
 ></DT
@@ -168,17 +196,17 @@ HREF="c464.html"
 ><DD
 ><DL
 ><DT
-><A
+>5.1. <A
 HREF="c464.html#AEN477"
 >Standard commands</A
 ></DT
 ><DT
-><A
+>5.2. <A
 HREF="x955.html"
 >Remote Mode Commands</A
 ></DT
 ><DT
-><A
+>5.3. <A
 HREF="x1669.html"
 >Appropriate Remote Commands</A
 ></DT
@@ -192,39 +220,39 @@ HREF="c1717.html"
 ><DD
 ><DL
 ><DT
-><A
+>6.1. <A
 HREF="c1717.html#AEN1719"
 >Introduction</A
 ></DT
 ><DT
-><A
+>6.2. <A
 HREF="x1734.html"
 >Weaving algorithms</A
 ></DT
 ><DD
 ><DL
 ><DT
-><A
+>6.2.1. <A
 HREF="x1734.html#AEN1740"
 >Simple weaving algorithms</A
 ></DT
 ><DT
-><A
+>6.2.2. <A
 HREF="x1734.html#AEN1757"
 >Perfect weaving</A
 ></DT
 ><DT
-><A
+>6.2.3. <A
 HREF="x1734.html#AEN1791"
 >Weaving collisions</A
 ></DT
 ><DT
-><A
+>6.2.4. <A
 HREF="x1734.html#AEN1809"
->What makes a “perfect� weave?</A
+>What makes a &#8220;perfect&#8221; weave?</A
 ></DT
 ><DT
-><A
+>6.2.5. <A
 HREF="x1734.html#AEN1937"
 >Oversampling</A
 ></DT
@@ -239,86 +267,86 @@ HREF="c1968.html"
 ></DT
 ><DT
 >A. <A
-HREF="gpl.html"
+HREF="a2122.html"
 >GNU General Public License</A
 ></DT
 ><DD
 ><DL
 ><DT
-><A
-HREF="gpl.html#gpl-preamble"
+>A.1. <A
+HREF="a2122.html#gpl-preamble"
 >Preamble</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html"
+>A.2. <A
+HREF="x2153.html"
 >TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
 ></DT
 ><DD
 ><DL
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect0"
+>A.2.1. <A
+HREF="x2153.html#gpl-sect0"
 >Section 0</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect1"
+>A.2.2. <A
+HREF="x2153.html#gpl-sect1"
 >Section 1</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect2"
+>A.2.3. <A
+HREF="x2153.html#gpl-sect2"
 >Section 2</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect3"
+>A.2.4. <A
+HREF="x2153.html#gpl-sect3"
 >Section 3</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect4"
+>A.2.5. <A
+HREF="x2153.html#gpl-sect4"
 >Section 4</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect5"
+>A.2.6. <A
+HREF="x2153.html#gpl-sect5"
 >Section 5</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect6"
+>A.2.7. <A
+HREF="x2153.html#gpl-sect6"
 >Section 6</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect7"
+>A.2.8. <A
+HREF="x2153.html#gpl-sect7"
 >Section 7</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect8"
+>A.2.9. <A
+HREF="x2153.html#gpl-sect8"
 >Section 8</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect9"
+>A.2.10. <A
+HREF="x2153.html#gpl-sect9"
 >Section 9</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect10"
+>A.2.11. <A
+HREF="x2153.html#gpl-sect10"
 >Section 10</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect11"
+>A.2.12. <A
+HREF="x2153.html#gpl-sect11"
 >NO WARRANTY</A
 ></DT
 ><DT
-><A
-HREF="gpl-terms.html#gpl-sect12"
+>A.2.13. <A
+HREF="x2153.html#gpl-sect12"
 >Section 12</A
 ></DT
 ></DL
diff --git a/doc/developer/reference-html/ln10.html b/doc/developer/reference-html/ln10.html
deleted file mode 100644
index 24f7a7f..0000000
--- a/doc/developer/reference-html/ln10.html
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
-REL="NEXT"
-TITLE="Preface"
-HREF="f14.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
-><BODY
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The Developer's Guide to Gutenprint</TH
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="legalnotice"
-><P
-></P
-><A
-NAME="AEN10"
-></A
-><P
->&#13;      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.
-    </P
-><P
->&#13;      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.
-    </P
-><P
->&#13;      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.
-    </P
-><P
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/developer/reference-html/stylesheet-images/caution.gif b/doc/developer/reference-html/stylesheet-images/caution.gif
deleted file mode 100644
index 9cc2e15..0000000
--- a/doc/developer/reference-html/stylesheet-images/caution.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/home.gif b/doc/developer/reference-html/stylesheet-images/home.gif
deleted file mode 100644
index 55e1d59..0000000
--- a/doc/developer/reference-html/stylesheet-images/home.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/important.gif b/doc/developer/reference-html/stylesheet-images/important.gif
deleted file mode 100644
index 25e40c7..0000000
--- a/doc/developer/reference-html/stylesheet-images/important.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/next.gif b/doc/developer/reference-html/stylesheet-images/next.gif
deleted file mode 100644
index 8c502e7..0000000
--- a/doc/developer/reference-html/stylesheet-images/next.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/note.gif b/doc/developer/reference-html/stylesheet-images/note.gif
deleted file mode 100644
index 7322e8e..0000000
--- a/doc/developer/reference-html/stylesheet-images/note.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/prev.gif b/doc/developer/reference-html/stylesheet-images/prev.gif
deleted file mode 100644
index 0894d9e..0000000
--- a/doc/developer/reference-html/stylesheet-images/prev.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/tip.gif b/doc/developer/reference-html/stylesheet-images/tip.gif
deleted file mode 100644
index f062955..0000000
--- a/doc/developer/reference-html/stylesheet-images/tip.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/toc-blank.gif b/doc/developer/reference-html/stylesheet-images/toc-blank.gif
deleted file mode 100644
index 6c65e3a..0000000
--- a/doc/developer/reference-html/stylesheet-images/toc-blank.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/toc-minus.gif b/doc/developer/reference-html/stylesheet-images/toc-minus.gif
deleted file mode 100644
index 40ebe61..0000000
--- a/doc/developer/reference-html/stylesheet-images/toc-minus.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/toc-plus.gif b/doc/developer/reference-html/stylesheet-images/toc-plus.gif
deleted file mode 100644
index 3e9e7d5..0000000
--- a/doc/developer/reference-html/stylesheet-images/toc-plus.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/up.gif b/doc/developer/reference-html/stylesheet-images/up.gif
deleted file mode 100644
index e899a27..0000000
--- a/doc/developer/reference-html/stylesheet-images/up.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/stylesheet-images/warning.gif b/doc/developer/reference-html/stylesheet-images/warning.gif
deleted file mode 100644
index a587079..0000000
--- a/doc/developer/reference-html/stylesheet-images/warning.gif
+++ /dev/null
diff --git a/doc/developer/reference-html/x1669.html b/doc/developer/reference-html/x1669.html
index 4fad283..1080dee 100644
--- a/doc/developer/reference-html/x1669.html
+++ b/doc/developer/reference-html/x1669.html
@@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Appropriate Remote Commands</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="ESC/P2"
 HREF="c464.html"><LINK
@@ -17,11 +17,14 @@ TITLE="Remote Mode Commands"
 HREF="x955.html"><LINK
 REL="NEXT"
 TITLE="Weaving for inkjet printers"
-HREF="c1717.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c1717.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -71,32 +74,32 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN1669"
->Appropriate Remote Commands</A
+>5.3. Appropriate Remote Commands</A
 ></H1
 ><P
 >&#13;        All of the remote commands described above are wrapped up with
         the usual boilerplate.  The files always start with
-        <VAR
+        <TT
 CLASS="literal"
->00 00 00</VAR
-> and the “magic�
-        command described above, then two <VAR
+>00 00 00</TT
+> and the &#8220;magic&#8221;
+        command described above, then two <TT
 CLASS="literal"
->ESC @</VAR
+>ESC @</TT
 >s to
         reset the printer.  The remote command sequences come next; if
         they print anything that is usually followed by a
-        <VAR
+        <TT
 CLASS="literal"
->FF</VAR
-> (<VAR
+>FF</TT
+> (<TT
 CLASS="literal"
->0C</VAR
+>0C</TT
 > hex) character to
         feed the page, then the file ends with another two
-        <VAR
+        <TT
 CLASS="literal"
->ESC @</VAR
+>ESC @</TT
 >s to get back to the ground state.
     </P
 ><P
@@ -108,9 +111,9 @@ CLASS="literal"
 TYPE="1"
 ><LI
 ><P
->&#13;            Host uses <VAR
+>&#13;            Host uses <TT
 CLASS="literal"
->DT</VAR
+>DT</TT
 > to print an alignment
             sheet.
           </P
@@ -123,24 +126,24 @@ CLASS="literal"
 ></LI
 ><LI
 ><P
->&#13;            Host sends a <VAR
+>&#13;            Host sends a <TT
 CLASS="literal"
->DA</VAR
+>DA</TT
 > command indicating
             which pattern the user chose.
           </P
 ></LI
 ><LI
 ><P
->&#13;            If the user said “realign�, meaning he isn't
+>&#13;            If the user said &#8220;realign&#8221;, meaning he isn't
             done yet, go to step 1.
           </P
 ></LI
 ><LI
 ><P
->&#13;            We are done: host sends a <VAR
+>&#13;            We are done: host sends a <TT
 CLASS="literal"
->SV</VAR
+>SV</TT
 > command
             and exits.
           </P
@@ -157,12 +160,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1693"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >PM 00 00
@@ -170,9 +167,6 @@ SN 00 00 00
 EX 00 00 00 00 05 01
 ST 00 01
 SM 00 02</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -186,12 +180,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1696"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >PM 00 00
@@ -201,9 +189,6 @@ SN 00 01 00
 SN 00 02 01
 EX 00 00 00 00 05 00
 FP 00 00 00</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -217,64 +202,55 @@ CLASS="informalexample"
 ><A
 NAME="AEN1699"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >IR 00 02
 LD</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;        For different paper type settings on the STP 870, the
-        arguments to <VAR
+        arguments to <TT
 CLASS="literal"
->SN</VAR
+>SN</TT
 > vary.  The arguments to the
-        first and third <VAR
+        first and third <TT
 CLASS="literal"
->SN</VAR
+>SN</TT
 > commands are as outlined
-        in the description of the <VAR
+        in the description of the <TT
 CLASS="literal"
->SN</VAR
+>SN</TT
 > command above;
-        the arguments to the second (“platen gap�) are
-        <VAR
+        the arguments to the second (&#8220;platen gap&#8221;) are
+        <TT
 CLASS="literal"
->00 01 01</VAR
-> for thick papers (“matte
-        paper—heavyweight�, “photo paper� and
-        “premium glossy photo paper�) and <VAR
+>00 01 01</TT
+> for thick papers (&#8220;matte
+        paper&#8212;heavyweight&#8221;, &#8220;photo paper&#8221; and
+        &#8220;premium glossy photo paper&#8221;) and <TT
 CLASS="literal"
 >00 01
-        00</VAR
+        00</TT
 > for all others.
     </P
 ><P
 >&#13;        For roll-mode printing, the STP 870's sequence changes as
-        follows.  <VAR
+        follows.  <TT
 CLASS="literal"
->IR</VAR
->'s arguments become <VAR
+>IR</TT
+>'s arguments become <TT
 CLASS="literal"
 >00
-        01</VAR
-> in the header, and <VAR
+        01</TT
+> in the header, and <TT
 CLASS="literal"
->00 00</VAR
+>00 00</TT
 > after
-        the job, and <VAR
+        the job, and <TT
 CLASS="literal"
->EX</VAR
+>EX</TT
 >'s last argument changes
         from <CODE
 CLASS="constant"
@@ -286,12 +262,12 @@ CLASS="constant"
     </P
 ><P
 >&#13;        For zero-margin printing on the STP 870, the arguments to
-        <VAR
+        <TT
 CLASS="literal"
->FP</VAR
-> become <VAR
+>FP</TT
+> become <TT
 CLASS="literal"
->00 0xb0 0xff</VAR
+>00 0xb0 0xff</TT
 >.
         This moves the origin about 5.5mm to the left, to a point one
         tenth of an inch to the left of the left-hand edge of the
@@ -330,7 +306,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x1734.html b/doc/developer/reference-html/x1734.html
index dfe36a3..8c52bfd 100644
--- a/doc/developer/reference-html/x1734.html
+++ b/doc/developer/reference-html/x1734.html
@@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Weaving algorithms</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="Weaving for inkjet printers"
 HREF="c1717.html"><LINK
@@ -17,11 +17,14 @@ TITLE="Weaving for inkjet printers"
 HREF="c1717.html"><LINK
 REL="NEXT"
 TITLE="Dithering"
-HREF="c1968.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c1968.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -71,11 +74,11 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN1734"
->Weaving algorithms</A
+>6.2. Weaving algorithms</A
 ></H1
 ><P
 >&#13;      I considered a few algorithms to perform the weave.  The first
-      one I devised let me use only (jets −
+      one I devised let me use only (jets &#8722;
       distance_between_jets + 1) nozzles, or 25.  This is OK in
       principle, but it's slower than using all nozzles.  By playing
       around with it some more, I came up with an algorithm that lets
@@ -85,13 +88,13 @@ NAME="AEN1734"
 ><P
 >&#13;      This still produces some banding, though.  Even better quality
       can be achieved by using multiple nozzles on the same line.  How
-      do we do this?  In 1440×720 mode, we're printing two
+      do we do this?  In 1440×720 mode, we're printing two
       output lines at the same vertical position.  However, if we want
       four passes, we have to effectively print each line twice.
       Actually doing this would increase the density, so what we do is
       print half the dots on each pass.  This produces near-perfect
       output, and it's far faster than using (pseudo)
-      “MicroWeave�.
+      &#8220;MicroWeave&#8221;.
     </P
 ><P
 >&#13;      Yet another complication is how to get near the top and bottom
@@ -125,7 +128,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1740"
->Simple weaving algorithms</A
+>6.2.1. Simple weaving algorithms</A
 ></H2
 ><P
 >&#13;        The initial problem is to calculate the starting position of
@@ -138,12 +141,12 @@ NAME="AEN1740"
       </P
 ><P
 >&#13;        Once we have a formula for the starting row of each pass, we
-        then turn that “inside out� to get a formula for
+        then turn that &#8220;inside out&#8221; to get a formula for
         the pass number containing each row.
       </P
 ><P
 >&#13;        First, let's define how our printer works.  We measure
-        vertical position on the paper in “rows�; the
+        vertical position on the paper in &#8220;rows&#8221;; the
         resolution with which the printer can position the paper
         vertically.  The print head contains J ink jets, which are
         spaced S rows apart.
@@ -157,7 +160,7 @@ NAME="AEN1740"
 >&#13;        It's pretty obvious how to do this.  We make one pass with
         the print head, printing J lines of data, each line S rows
         after the previous one.  We then advance the paper by S
-        × J rows and print the next row.  For example, if J =
+        × J rows and print the next row.  For example, if J =
         7 and S = 4, this method can be illustrated like this:
       </P
 ><DIV
@@ -167,12 +170,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1747"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >pass number
@@ -186,9 +183,6 @@ CLASS="screen"
                             4 rows offset from one jet to the next
 \---------------------------/
    7*4=28 rows offset from one pass to the next</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -210,7 +204,7 @@ CLASS="computeroutput"
 CLASS="computeroutput"
 >0</SAMP
 > and starts at row 0.  Each
-        subsequent pass p starts at row p × S × J.  Each
+        subsequent pass p starts at row p × S × J.  Each
         pass prints J lines, each line being S rows after the previous
         one.  (For ease of viewing this file on a standard terminal,
         I'm clipping the examples at column 80.)
@@ -221,7 +215,7 @@ CLASS="computeroutput"
         rows with printing to get a full-density page (we're
         ignoring oversampling at this stage).  Where we have
         previously printed a single pass, we'll now print a
-        “pass block�: we print extra passes to fill in
+        &#8220;pass block&#8221;: we print extra passes to fill in
         the empty rows.  A naive implementation might look like
         this:
       </P
@@ -232,12 +226,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1754"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *---*---*---*---*---*---*
@@ -252,15 +240,12 @@ CLASS="screen"
 9                                                          *---*---*---*---*---*
 10                                                          *---*---*---*---*---
 11                                                           *---*---*---*---*--</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;        (Now you can see why this process is called
-        “weaving�!)
+        &#8220;weaving&#8221;!)
       </P
 ></DIV
 ><DIV
@@ -269,7 +254,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1757"
->Perfect weaving</A
+>6.2.2. Perfect weaving</A
 ></H2
 ><P
 >&#13;        This simple weave pattern prints every row, but will give
@@ -286,15 +271,15 @@ NAME="AEN1757"
         each pass as possible.
       </P
 ><P
->&#13;        Each pass block prints S × J lines in S passes.  The
-        first line printed in each pass block is S × J rows
+>&#13;        Each pass block prints S × J lines in S passes.  The
+        first line printed in each pass block is S × J rows
         lower on the page than the first line printed in the
         previous pass block.  Therefore, if we advance the paper by
         J rows between each pass, we can print the right number of
         passes in each block and advance the paper perfectly evenly.
       </P
 ><P
->&#13;        Here's what this “perfect� weave looks like:
+>&#13;        Here's what this &#8220;perfect&#8221; weave looks like:
       </P
 ><DIV
 CLASS="informalexample"
@@ -303,12 +288,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1763"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >                    start of full weave
@@ -325,16 +304,13 @@ CLASS="screen"
 9                                                                *---*---*---*--
 10                                                                      *---*---
 11                                                                             *</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;        You'll notice that, for the first few rows, this weave is
-        too sparse.  It is not until the row marked “start of
-        full weave� that every subsequent row is printed.  We
+        too sparse.  It is not until the row marked &#8220;start of
+        full weave&#8221; that every subsequent row is printed.  We
         can calculate this start position as follows:
       </P
 ><DIV
@@ -344,18 +320,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN1766"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
->start = (S − 1) × (J − 1)</PRE
-></TD
-></TR
-></TABLE
+>start = (S &#8722; 1) × (J &#8722; 1)</PRE
 ><P
 ></P
 ></DIV
@@ -374,14 +341,8 @@ CLASS="informalexample"
 NAME="AEN1770"
 ></A
 ><P
->&#13;          S = 2, J = 7, start = (2−1) × (7−1) = 6:
+>&#13;          S = 2, J = 7, start = (2&#8722;1) × (7&#8722;1) = 6:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >        starting row of full weave
@@ -394,9 +355,6 @@ CLASS="screen"
 5                                    *-*-*-*-*-*-*
 6                                           *-*-*-*-*-*-*
 7                                                  *-*-*-*-*-*-*</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -410,12 +368,6 @@ NAME="AEN1773"
 ><P
 >&#13;          S = 7, J = 2, start = 6:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >        start
@@ -430,9 +382,6 @@ CLASS="screen"
 7               *------*
 8                 *------*
 9                   *------*</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -446,12 +395,6 @@ NAME="AEN1776"
 ><P
 >&#13;          S = 4, J = 13, start = 36:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >                                      start
@@ -462,9 +405,6 @@ CLASS="screen"
 3                                        *---*---*---*---*---*---*---*---*---*--
 4                                                     *---*---*---*---*---*---*-
 5                                                                  *---*---*---*</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -478,12 +418,6 @@ NAME="AEN1779"
 ><P
 >&#13;          S = 13, J = 4, start = 36:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >                                      start
@@ -508,9 +442,6 @@ CLASS="screen"
 17                                                                    *---------
 18                                                                        *-----
 19                                                                            *-</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -524,12 +455,6 @@ NAME="AEN1782"
 ><P
 >&#13;          S = 8, J = 5, start = 28:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >                              start
@@ -550,9 +475,6 @@ CLASS="screen"
 13                                                                 *-------*----
 14                                                                      *-------
 15                                                                           *--</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -566,12 +488,6 @@ NAME="AEN1785"
 ><P
 >&#13;          S = 9, J = 5, start = 32:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >                                  start
@@ -592,9 +508,6 @@ CLASS="screen"
 13                                                                 *--------*---
 14                                                                      *-------
 15                                                                           *--</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -608,12 +521,6 @@ NAME="AEN1788"
 ><P
 >&#13;          S = 6, J = 7, start = 30:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >                                start
@@ -630,9 +537,6 @@ CLASS="screen"
 9                                                                *-----*-----*--
 10                                                                      *-----*-
 11                                                                             *</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -643,7 +547,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1791"
->Weaving collisions</A
+>6.2.3. Weaving collisions</A
 ></H2
 ><P
 >&#13;        A perfect weave is not possible in all cases.  Let's look at
@@ -659,12 +563,6 @@ NAME="AEN1794"
 ><P
 >&#13;          S = 6, J = 4:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*
@@ -675,9 +573,6 @@ CLASS="screen"
 5             |   ^ | *-^---*-----*-----*
               OUCH!   ^ |   ^
                       |     |</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -694,18 +589,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN1798"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
->row(p, j) = (p × J) + (j × S)</PRE
-></TD
-></TR
-></TABLE
+>row(p, j) = (p × J) + (j × S)</PRE
 ><P
 ></P
 ></DIV
@@ -720,19 +606,10 @@ CLASS="informalexample"
 ><A
 NAME="AEN1801"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
->row(0, 2) = (0 × 4) + (2 × 6) = 12
-row(3, 0) = (3 × 4) + (0 × 6) = 12</PRE
-></TD
-></TR
-></TABLE
+>row(0, 2) = (0 × 4) + (2 × 6) = 12
+row(3, 0) = (3 × 4) + (0 × 6) = 12</PRE
 ><P
 ></P
 ></DIV
@@ -759,12 +636,6 @@ NAME="AEN1806"
 ><P
 >&#13;          S = 6, J = 4:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*
@@ -773,9 +644,6 @@ CLASS="screen"
 3             ^-----^-----*-----*
 4                 ^-----^-----*-----*
 5                     ^-----^-----*-----*</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -786,7 +654,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1809"
->What makes a “perfect� weave?</A
+>6.2.4. What makes a &#8220;perfect&#8221; weave?</A
 ></H2
 ><P
 >&#13;        So what causes the perfect weave cases to be perfect, and
@@ -862,9 +730,9 @@ TYPE="1"
 ></LI
 ></OL
 ><P
->&#13;        These repeated subtractions can be done with C's <VAR
+>&#13;        These repeated subtractions can be done with C's <TT
 CLASS="literal"
->%</VAR
+>%</TT
 >
         operator, so we can write this in C as follows:
       </P
@@ -875,12 +743,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1836"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >unsigned int
@@ -895,21 +757,18 @@ gcd(unsigned int x, unsigned int y)
   }
   return y;
 }</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;        <VAR
+>&#13;        <TT
 CLASS="literal"
->gcd(S,J)</VAR
+>gcd(S,J)</TT
 > will feature quite prominently in our
         weaving algorithm.
       </P
 ><P
->&#13;        If 0 ≤ j &#60; J, there should only be a single pair (p, j)
+>&#13;        If 0 &#8804; j &#60; J, there should only be a single pair (p, j)
         for any given row number.  If S and J are not relatively
         prime, this assumption breaks down.  (For conciseness, let G
         = GCD(S,J).)
@@ -924,12 +783,6 @@ NAME="AEN1841"
 ><P
 >&#13;          S = 8, J = 6, G = 2:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*-------*-------*-------*
@@ -938,9 +791,6 @@ CLASS="screen"
 3                   *-------*-------*-------*-------*-------*
 4                         ^-------^-------^-------*-------*-------*
 5                               ^-------^-------^-------*-------*-------*</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -962,12 +812,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1846"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*       -       -       -
@@ -976,9 +820,6 @@ CLASS="screen"
 3          *-------*-------*       -       -       -
 4             *-------*-------*       -       -       -
 5                *-------*-------*       -       -       -</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -993,12 +834,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1849"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*       -       -       -
@@ -1009,9 +844,6 @@ CLASS="screen"
 5                               *-------*-------*       -       -       -
              ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^
             These rows need filling in.</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1025,19 +857,19 @@ CLASS="computeroutput"
       </P
 ><P
 >&#13;        Let's analyse this.  Consider how a pass p could collide
-        with pass 0.  Pass p starts at offset p × J.  Pass 0
-        prints at rows which are multiples of S.  If p × J is
+        with pass 0.  Pass p starts at offset p × J.  Pass 0
+        prints at rows which are multiples of S.  If p × J is
         exactly divisible by S, a collision has occurred, unless (p
-        ×J) ≥ J × S (which will happen when we
+        ×J) &#8805; J × S (which will happen when we
         finish a pass block).
       </P
 ><P
->&#13;        So, we want to find p and q such that p × J = q
-        × S and p is minimised.  Then p is the number of rows
+>&#13;        So, we want to find p and q such that p × J = q
+        × S and p is minimised.  Then p is the number of rows
         before a collision, and q is the number of jets in pass 0
         which are not involved in the collision.  To do this, we
         find the lowest common multiple of J and S, which is L = (J
-        × S) / G.  L / J is the number of rows before a
+        × S) / G.  L / J is the number of rows before a
         collision, and L / S is the number of jets in the first pass
         not involved in the collision.
       </P
@@ -1045,7 +877,7 @@ CLASS="computeroutput"
 >&#13;        Thus, we see that the first J / G rows printed by a given
         pass are not overprinted by any later pass.  However, the
         rest of the rows printed by pass p are overprinted by the
-        first J − (J / G) jets of pass p + (S / G).  We will
+        first J &#8722; (J / G) jets of pass p + (S / G).  We will
         use C to refer to S / G, the number of rows after which a
         collision occurs.
       </P
@@ -1062,12 +894,6 @@ NAME="AEN1857"
 ><P
 >&#13;          S = 6, J = 9, G = 3, C = S / G = 2:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1078,14 +904,11 @@ CLASS="screen"
 5                                              ^-----^-----^-----^-----^-----^--
        ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^ ^^
             These rows need filling in.</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;        In this case, the first J − (J / G) = 9 − (9 /
+>&#13;        In this case, the first J &#8722; (J / G) = 9 &#8722; (9 /
         3) = 6 jets of pass p + (6 / 3) = p + 2 collide with the
         last 6 jets of pass p.  Only one row in every G = 2 rows is
         printed by this weave.
@@ -1100,12 +923,6 @@ NAME="AEN1861"
 ><P
 >&#13;          S = 9, J = 6, G = 3, C = 3:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >&#13;0 *--------*--------*--------*--------*--------*
@@ -1114,9 +931,6 @@ CLASS="screen"
 3                   ^--------^--------^--------^--------*--------*
 4                         ^--------^--------^--------^--------*--------*
 5                               ^--------^--------^--------^--------*--------*</PRE
-></TD
-></TR
-></TABLE
 ><P
 >&#13;          Here, the first J - (J / G) = 6 - (6 / 3) = 4 jets of pass
           p + (9 / 3) = p + 3 collide with the last 4 jets of pass
@@ -1153,12 +967,6 @@ NAME="AEN1868"
 ><P
 >&#13;            S = 7, J = 2, G = 1:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >              imaginary extra jet
@@ -1174,28 +982,25 @@ CLASS="screen"
 7               *------*  &#60;--start of pass block 1
 8                 *------*
 9                   *------*</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;          We can now calculate the start of a given pass by
           reference to its pass block.  The first pass of pass block
-          b always starts at row (b × S × J).  The start
+          b always starts at row (b × S × J).  The start
           row of each of the other passes in the block are
           calculated using offsets from this row.
         </P
 ><P
 >&#13;          For the example above, there are 7 passes in each pass
           block, and their offsets are 0, 2, 4, 6, 8, 10 and 12.
-          The next pass block is offset S × J = 14 rows from
+          The next pass block is offset S × J = 14 rows from
           the start of the current pass block.
         </P
 ><P
->&#13;          The simplest way to modify the “perfect� weave
-          pattern to give a correct weave in cases where G ≠ 1
+>&#13;          The simplest way to modify the &#8220;perfect&#8221; weave
+          pattern to give a correct weave in cases where G &#8800; 1
           is to simply change any offsets which would result in a
           collision, until the collision disappears.  Every printed
           row in the weave, as we have shown it up to now, is
@@ -1224,7 +1029,7 @@ CLASS="screen"
           The passes in the second subblock each have 1 added to
           their offset, the passes in the third subblock have 2
           added, and so on.  Thus, the offset of pass p (numbered
-          relative to the start of its pass block) is p × J +
+          relative to the start of its pass block) is p × J +
           floor(p / B).
         </P
 ><P
@@ -1240,12 +1045,6 @@ NAME="AEN1878"
 ><P
 >&#13;            S = 6, J = 9, G = 3, B = 2:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1261,9 +1060,6 @@ CLASS="screen"
   |              |                  start of subblock 2 (offset 2 rows)
   |              start of subblock 1 (following passes offset by 1 row)
 start of passblock 0, subblock 0 (pass start calculated as p*J)</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1277,12 +1073,6 @@ NAME="AEN1881"
 ><P
 >&#13;            S = 9,  J = 6,  G = 3,  B = 3:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *--------*--------*--------*--------*--------*
@@ -1298,9 +1088,6 @@ CLASS="screen"
 10                                                  \---/     *--------*--------
 11                                               small offset       *--------*--
 12                                                                         *----</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1320,12 +1107,6 @@ NAME="AEN1885"
 ><P
 >&#13;            S = 8, J = 4, G = 4, B = 2:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*-------*
@@ -1339,9 +1120,6 @@ CLASS="screen"
 8                                 *-------*-------*-------*
 9                                \/   *-------*-------*-------*
                             very small offset!</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1356,12 +1134,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1889"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >subblock number
@@ -1376,9 +1148,6 @@ CLASS="screen"
 1  *
 2   *
 3    *</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1399,19 +1168,10 @@ CLASS="informalexample"
 ><A
 NAME="AEN1893"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >offset(b) = 2*b             , if b &#60; ceiling(G/2)
           = 2*(G-b)-1       , otherwise</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1425,12 +1185,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1896"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0123456789
@@ -1454,9 +1208,6 @@ CLASS="screen"
 7      *
 8    *
 9  *</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1470,12 +1221,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1899"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >           1
@@ -1502,9 +1247,6 @@ CLASS="screen"
  8      *
  9    *
 10  *</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1521,12 +1263,6 @@ NAME="AEN1902"
 ><P
 >&#13;            S = 12, J = 6, G = 6, B = 2:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----------*-----------*-----------*-----------*-----------*
@@ -1542,9 +1278,6 @@ CLASS="screen"
 10                                                             *-----------*----
 11                                                                   *----------
 12                                                                        *-----</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1556,7 +1289,7 @@ CLASS="screen"
 >&#13;          (This might seem odd, but it occurs to me that a good
           weave pattern might also make a good score for bell
           ringers.  When church bells are rung, a list of
-          “changes� are used.  For example, if 8 bells
+          &#8220;changes&#8221; are used.  For example, if 8 bells
           are being used, they will, at first, be rung in order:
           12345678.  If the first change is for bells 5 and 6, the
           bells will then be rung in the order 12346578.  If the
@@ -1584,12 +1317,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1909"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >passesperblock = S
@@ -1603,9 +1330,6 @@ if subpassblock &#60; ceiling(subblocksperblock/2)
 else
   subblockoffset = 2*(subblocksperblock-subpassblock)-1
 startingrow = passblock * S * J + offsetinpassblock * J + subblockoffset</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1621,12 +1345,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1912"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >subblocksperblock = gcd(S, J)
@@ -1636,9 +1354,6 @@ if subpassblock * 2 &#60; subblocksperblock
 else
   subblockoffset = 2*(subblocksperblock-subpassblock)-1
 startingrow = p * J + subblockoffset</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1652,12 +1367,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1915"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >subblocksperblock = gcd(S, J)
@@ -1669,14 +1378,11 @@ subblockoffset(p)
     subpassblock = floor((p % S) * subblocksperblock / S)
 
 row(j, p) = p * J + subblockoffset(p) + j * S</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;          Together with the inequality 0 ≤ j &#60; J, we can use
+>&#13;          Together with the inequality 0 &#8804; j &#60; J, we can use
           this definition in reverse to calculate the pass number
           containing a given row, r.  Working out the inverse
           definition involves a little guesswork, but one possible
@@ -1691,20 +1397,11 @@ CLASS="informalexample"
 ><A
 NAME="AEN1918"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >subblocksperblock = gcd(S, J)
 subblockoffset = r % subblocksperblock
 pass = (r - subblockoffset) / J</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1719,12 +1416,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1921"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >offset = r % J
@@ -1735,9 +1426,6 @@ pass--
 offset += J
 }
 jet = offset / S</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1752,12 +1440,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1924"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >G = gcd(S, J)
@@ -1777,9 +1459,6 @@ subblockretreat = floor(pass / passespersubblock) % G
 pass -= subblockretreat * passespersubblock
 pass += subpassblock * passespersubblock
 jet = (r - subblockoffset - pass * J) / S</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1799,12 +1478,6 @@ NAME="AEN1927"
             passesperblock = S = 6,
             passespersubblock = S / G = 6 / 2 = 3:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*
@@ -1827,9 +1500,6 @@ CLASS="screen"
 17                                                                     *-----*--
 18                                                                        *-----
 19                                                                            *-</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1845,12 +1515,6 @@ NAME="AEN1930"
             passesperblock = S = 8,
             passespersubblock= S / G = 8 / 2 = 4:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-------*-------*-------*-------*-------*
@@ -1866,9 +1530,6 @@ CLASS="screen"
 10                                                            *-------*-------*-
 11                                                                  *-------*---
 12                                                                         *----</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1884,12 +1545,6 @@ NAME="AEN1933"
             passesperblock = S = 6,
             passespersubblock= S / G = 6 / 6 = 1:
           </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*-----*
@@ -1899,9 +1554,6 @@ CLASS="screen"
 4                                                    *-----*-----*-----*-----*--
 5                                                              *-----*-----*----
 6                                                                         *-----</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1920,7 +1572,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN1937"
->Oversampling</A
+>6.2.5. Oversampling</A
 ></H2
 ><P
 >&#13;        By oversampling, we mean printing on the same row more than
@@ -1937,7 +1589,7 @@ NAME="AEN1937"
         necessary to get a 1/1440" horizontal resolution.  If it can
         only print two drops 1/360" apart, 4x oversampling will be
         necessary for a 1/1440" horizontal resolution.  The printer
-        enforces this “drop spacing� by only accepting
+        enforces this &#8220;drop spacing&#8221; by only accepting
         raster passes with a horizontal resolution matching the
         spacing with which it can print dots, so we must print
         passes at different horizontal positions if we are to obtain
@@ -1948,18 +1600,18 @@ NAME="AEN1937"
 ><P
 >&#13;        Oversampling can also be done to decrease the banding
         apparent in an image.  By splitting a row into two or more
-        sets of dots (“lines�) and printing each line on
+        sets of dots (&#8220;lines&#8221;) and printing each line on
         the same row, but with a different nozzle for each line, we
         can get a smoother print.
       </P
 ><P
 >&#13;        To quantify these two kinds of oversampling, we'll introduce
         two new constants: H shows how many different horizontal
-        offsets we want to print at (the “horizontal
-        oversampling�) while O shows how many times we want to
+        offsets we want to print at (the &#8220;horizontal
+        oversampling&#8221;) while O shows how many times we want to
         print each row, over and above the number of times necessary
-        for horizontal oversampling (the “extra
-        oversampling�).
+        for horizontal oversampling (the &#8220;extra
+        oversampling&#8221;).
       </P
 ><P
 >&#13;        It is necessary for all the lines printed by a given pass to
@@ -1977,10 +1629,10 @@ NAME="AEN1937"
         advance the paper between passes.  Previously, we'd have
         defined A = J; we now let A = J / H.  This also affects our
         pass blocks.  Printing one pass block used to involve
-        advancing the paper S × J rows; it now advances the
-        paper (S×J) / H rows.  We therefore name a group of H
-        pass blocks a “band�.  Printing one band
-        involves advancing the paper S×J rows, as a pass
+        advancing the paper S × J rows; it now advances the
+        paper (S×J) / H rows.  We therefore name a group of H
+        pass blocks a &#8220;band&#8221;.  Printing one band
+        involves advancing the paper S×J rows, as a pass
         block did before.
       </P
 ><P
@@ -2002,12 +1654,6 @@ NAME="AEN1946"
           passesperblock = S = 4,
           passespersubblock = S/G = 4/1 = 4:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 *---*---*---*---*---*---*---*---*---*
@@ -2026,9 +1672,6 @@ CLASS="screen"
 13                                                                 *---*---*---*
 14                                                                      *---*---
 15                                                                           *--</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -2040,7 +1683,7 @@ CLASS="screen"
 CLASS="computeroutput"
 >*</SAMP
 >s
-        with integers in the range [0…H−1].
+        with integers in the range [0&#8230;H&#8722;1].
       </P
 ><P
 >&#13;        Overprinting occurs once per pass block, so we can simply
@@ -2055,12 +1698,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1952"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 0---0---0---0---0---0---0---0---0---0
@@ -2079,9 +1716,6 @@ CLASS="screen"
 13                                                                 1---1---1---1
 14                                                                      1---1---
 15                                                                           1--</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -2098,12 +1732,6 @@ NAME="AEN1954"
           passesperblock= S = 4,
           passespersubblock= S/G = 4/2 = 2:
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >0 0---0---0---0---0---0---0---0---0---0---0---0
@@ -2119,9 +1747,6 @@ CLASS="screen"
 10                                                             0---0---0---0---0
 11                                                                   0---0---0--
 12                                                                        1---1-</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -2145,12 +1770,6 @@ NAME="AEN1958"
           passesperblock = S = 4,
           passespersubblock = S/G = 4/1 = 4
         </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >Band 0:
@@ -2171,9 +1790,6 @@ Band 1:
 12                                                                1---1---1---1-
 13                                                                     1---1---1
 14                                                                          1---</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -2188,12 +1804,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1962"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >A = floor(J / H)
@@ -2207,9 +1817,6 @@ band = floor(P / (S * H))
 passinband = P % (S * H)
 startingrow = band * S * J + passinband * A + subblockoffset
 subpass = passinband / S</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -2222,12 +1829,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1965"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >A = floor(J / H)
@@ -2244,11 +1845,8 @@ passinband(p) = p % (S * H)
 
 row(j, p) = band(p) * S * J + passinband(p) * A + subblockoffset(p) + j * S
 row(j, p) = p * J + subblockoffset(p) + j * S</PRE
-></TD
-></TR
-></TABLE
 ><P
->&#13;            To be continued…
+>&#13;            To be continued&#8230;
           </P
 ><P
 ></P
@@ -2282,7 +1880,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/gpl-terms.html b/doc/developer/reference-html/x2153.html
index 31088e9..4ccc109 100644
--- a/doc/developer/reference-html/gpl-terms.html
+++ b/doc/developer/reference-html/x2153.html
@@ -1,24 +1,27 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="GNU General Public License"
-HREF="gpl.html"><LINK
+HREF="a2122.html"><LINK
 REL="PREVIOUS"
 TITLE="GNU General Public License"
-HREF="gpl.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="a2122.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -39,7 +42,7 @@ WIDTH="10%"
 ALIGN="left"
 VALIGN="bottom"
 ><A
-HREF="gpl.html"
+HREF="a2122.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -64,7 +67,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="gpl-terms"
->TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
+>A.2. TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</A
 ></H1
 ><DIV
 CLASS="sect2"
@@ -72,7 +75,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect0"
->Section 0</A
+>A.2.1. Section 0</A
 ></H2
 ><P
 >&#13;	This License applies to any program or other work which
@@ -112,7 +115,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect1"
->Section 1</A
+>A.2.2. Section 1</A
 ></H2
 ><P
 >&#13;	You may copy and distribute verbatim copies of the Program's
@@ -135,14 +138,14 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect2"
->Section 2</A
+>A.2.3. Section 2</A
 ></H2
 ><P
 >&#13;	You may modify your copy or copies of the Program or any
 	portion of it, thus forming a work based on the Program, and
 	copy and distribute such modifications or work under the terms
 	of <A
-HREF="gpl-terms.html#gpl-sect1"
+HREF="x2153.html#gpl-sect1"
 >Section 1</A
 > above, provided
 	that you also meet all of these conditions:
@@ -181,18 +184,43 @@ TYPE="a"
 
 	      <DIV
 CLASS="note"
-><BLOCKQUOTE
-CLASS="note"
 ><P
+></P
+><TABLE
+CLASS="note"
+WIDTH="100%"
+BORDER="0"
+><TR
+><TD
+WIDTH="25"
+ALIGN="CENTER"
+VALIGN="TOP"
+><IMG
+SRC="../images/note.gif"
+HSPACE="5"
+ALT="Note"></TD
+><TH
+ALIGN="LEFT"
+VALIGN="MIDDLE"
 ><B
->Exception:: </B
->
-		  If the Program itself is interactive but does not
+>Exception:</B
+></TH
+></TR
+><TR
+><TD
+>&nbsp;</TD
+><TD
+ALIGN="LEFT"
+VALIGN="TOP"
+><P
+>&#13;		  If the Program itself is interactive but does not
 		  normally print such an announcement, your work based
 		  on the Program is not required to print an
 		  announcement.)
 		</P
-></BLOCKQUOTE
+></TD
+></TR
+></TABLE
 ></DIV
 >
 
@@ -234,19 +262,19 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect3"
->Section 3</A
+>A.2.4. Section 3</A
 ></H2
 ><P
 >&#13;	You may copy and distribute the Program (or a work based on
 	it, under <A
-HREF="gpl-terms.html#gpl-sect2"
+HREF="x2153.html#gpl-sect2"
 >Section 2</A
 > in object
 	code or executable form under the terms of <A
-HREF="gpl-terms.html#gpl-sect1"
+HREF="x2153.html#gpl-sect1"
 >Sections 1</A
 > and <A
-HREF="gpl-terms.html#gpl-sect2"
+HREF="x2153.html#gpl-sect2"
 >2</A
 > above provided that you also do
 	one of the following:
@@ -315,7 +343,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect4"
->Section 4</A
+>A.2.5. Section 4</A
 ></H2
 ><P
 >&#13;	You may not copy, modify, sublicense, or distribute the
@@ -334,7 +362,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect5"
->Section 5</A
+>A.2.6. Section 5</A
 ></H2
 ><P
 >&#13;	You are not required to accept this License, since you have
@@ -354,7 +382,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect6"
->Section 6</A
+>A.2.7. Section 6</A
 ></H2
 ><P
 >&#13;	Each time you redistribute the Program (or any work based on
@@ -372,7 +400,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect7"
->Section 7</A
+>A.2.8. Section 7</A
 ></H2
 ><P
 >&#13;	If, as a consequence of a court judgment or allegation of
@@ -420,7 +448,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect8"
->Section 8</A
+>A.2.9. Section 8</A
 ></H2
 ><P
 >&#13;	If the distribution and/or use of the Program is restricted in
@@ -439,7 +467,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect9"
->Section 9</A
+>A.2.10. Section 9</A
 ></H2
 ><P
 >&#13;	The Free Software Foundation may publish revised and/or new
@@ -464,7 +492,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect10"
->Section 10</A
+>A.2.11. Section 10</A
 ></H2
 ><P
 >&#13;	If you wish to incorporate parts of the Program into other
@@ -484,7 +512,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect11"
->NO WARRANTY</A
+>A.2.12. NO WARRANTY</A
 ></H2
 ><FONT
 COLOR="RED"
@@ -508,7 +536,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="gpl-sect12"
->Section 12</A
+>A.2.13. Section 12</A
 ></H2
 ><P
 >&#13;	IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
@@ -541,7 +569,7 @@ WIDTH="33%"
 ALIGN="left"
 VALIGN="top"
 ><A
-HREF="gpl.html"
+HREF="a2122.html"
 ACCESSKEY="P"
 >Prev</A
 ></TD
@@ -550,7 +578,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
@@ -571,7 +599,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="gpl.html"
+HREF="a2122.html"
 ACCESSKEY="U"
 >Up</A
 ></TD
diff --git a/doc/developer/reference-html/x271.html b/doc/developer/reference-html/x271.html
index c4b2518..9337d74 100644
--- a/doc/developer/reference-html/x271.html
+++ b/doc/developer/reference-html/x271.html
@@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >The driver file</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="Adding a new printer"
 HREF="c200.html"><LINK
@@ -17,11 +17,14 @@ TITLE="Adding a new printer"
 HREF="c200.html"><LINK
 REL="NEXT"
 TITLE="ESC/P2"
-HREF="c464.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c464.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -71,7 +74,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN271"
->The driver file</A
+>4.2. The driver file</A
 ></H1
 ><P
 >&#13;      Adding a new printer to a driver module
@@ -112,7 +115,7 @@ CLASS="filename"
       prefer this; it isn't materially more work for the host to
       compute things like exact paper sizes and such, it allows a lot
       more tweaking, and it may be why Epson has been more open with
-      information—the communication protocol doesn't really
+      information&#8212;the communication protocol doesn't really
       contain very much IP, so they have less reason to keep it
       secret.
     </P
@@ -125,20 +128,20 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN281"
->Epson inkjet printers</A
+>4.2.1. Epson inkjet printers</A
 ></H2
 ><P
->&#13;        The <VAR
+>&#13;        The <CODE
 CLASS="varname"
->model_capabilities</VAR
+>model_capabilities</CODE
 > vector in
         <TT
 CLASS="filename"
 >print-escp2.c</TT
 > contains one entry for each
-        defined printer model.  The <VAR
+        defined printer model.  The <TT
 CLASS="literal"
->model</VAR
+>model</TT
 > parameter
         in <TT
 CLASS="filename"
@@ -164,12 +167,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN291"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >typedef struct escp2_printer
@@ -245,9 +242,6 @@ const double *hue_adjustment;
 const double *sat_adjustment;
 const paperlist_t *paperlist;
 } escp2_printer_t;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -277,21 +271,21 @@ const paperlist_t *paperlist;
 >&#13;        Most printers can print using either the number of nozzles
         available or any smaller number.  Some printers require that
         all of the nozzles be used.  Those printers will set
-        <VAR
+        <CODE
 CLASS="varname"
->min_nozzles</VAR
+>min_nozzles</CODE
 > and/or
-        <VAR
+        <CODE
 CLASS="varname"
->min_black_nozzles</VAR
+>min_black_nozzles</CODE
 > to the same value as
-        <VAR
+        <CODE
 CLASS="varname"
->nozzles</VAR
+>nozzles</CODE
 > and/or
-        <VAR
+        <CODE
 CLASS="varname"
->black_nozzles</VAR
+>black_nozzles</CODE
 >.
       </P
 ><P
@@ -304,9 +298,9 @@ CLASS="varname"
 ><P
 >&#13;        Most Epson printers, other than the high-end Stylus Pro
         models, cannot print dots spaced more closely than 1/360" or
-        1/720" apart (this is the setting for <VAR
+        1/720" apart (this is the setting for <CODE
 CLASS="varname"
->xres</VAR
+>xres</CODE
 >.
         This is true even for printers that support resolutions of
         1440 or 2880 DPI.  In these cases, the data must be printed in
@@ -320,25 +314,25 @@ CLASS="varname"
         For example, the Stylus Photo EX can normally print with a dot
         spacing of 1/720".  The smallest dot size cannot be printed
         with a dot spacing of less than 1/360", however.  In this
-        case, we use <VAR
+        case, we use <CODE
 CLASS="varname"
->enhanced_xres</VAR
+>enhanced_xres</CODE
 > to specify the
         resolution to be used in this enhanced mode, and
-        <VAR
+        <CODE
 CLASS="varname"
->enhanced_resolution</VAR
+>enhanced_resolution</CODE
 > to specify the printing
         resolution above which we use the
-        <VAR
+        <CODE
 CLASS="varname"
->enhanced_xres</VAR
+>enhanced_xres</CODE
 >.
       </P
 ><P
->&#13;        The <VAR
+>&#13;        The <CODE
 CLASS="varname"
->resolution_scale</VAR
+>resolution_scale</CODE
 > command is used to
         specify scaling factors for the dot separation on newer
         printers.  It should always be 14400 with current printers.
@@ -355,26 +349,26 @@ CLASS="function"
 >INCH</CODE
 > macro defined
         to make specification of the
-        <VAR
+        <CODE
 CLASS="varname"
->max_paper_width</VAR
+>max_paper_width</CODE
 > and
-        <VAR
+        <CODE
 CLASS="varname"
->max_paper_height</VAR
+>max_paper_height</CODE
 > more legible.  It
         multiplies <CODE
 CLASS="constant"
 >72</CODE
 > by the provided expression
         to get the appropriate number of points.  For example, to
-        specify 8.5", <VAR
+        specify 8.5", <TT
 CLASS="literal"
->INCH(17/2)</VAR
+>INCH(17/2)</TT
 > expands to
-        <VAR
+        <TT
 CLASS="literal"
->(72 * 17/2)</VAR
+>(72 * 17/2)</TT
 >, which is evaluated left to
         right, and hence generates the correct value.
       </P
@@ -385,25 +379,25 @@ CLASS="literal"
 CLASS="constant"
 >1</CODE
 > for
-        <VAR
+        <CODE
 CLASS="varname"
->separation_rows</VAR
+>separation_rows</CODE
 > and <CODE
 CLASS="constant"
 >0</CODE
 >
         for the others.  Very, very few printers require (or allow)
-        <VAR
+        <CODE
 CLASS="varname"
->separation_rows</VAR
+>separation_rows</CODE
 > to be anything but
         <CODE
 CLASS="constant"
 >1</CODE
 > and
-        <VAR
+        <CODE
 CLASS="varname"
->pseudo_separation_rows</VAR
+>pseudo_separation_rows</CODE
 > other than
         <CODE
 CLASS="constant"
@@ -414,9 +408,9 @@ CLASS="constant"
         exceptions.
       </P
 ><P
->&#13;        <VAR
+>&#13;        <CODE
 CLASS="varname"
->zero_margin_offset</VAR
+>zero_margin_offset</CODE
 > is used to specify an
         additional negative horizontal offset required to print to the
         edges of the paper on newer Stylus Photo printers.  These must
@@ -483,14 +477,14 @@ CLASS="emphasis"
 ><P
 >&#13;        The lists of dot sizes and densities contain values for 13
         printing modes: 120/180 DPI using printer weaving (single row;
-        incorrectly referred to as “microweave�) and
-        “soft� weaving (the driver determines the exact
+        incorrectly referred to as &#8220;microweave&#8221;) and
+        &#8220;soft&#8221; weaving (the driver determines the exact
         pattern of dot layout), 360 DPI microweave and softweave,
-        720×360 DPI microweave and softweave, 720 DPI microweave
-        and softweave, 1440×720 microweave and softweave,
-        2880×720 microweave and softweave, and 2880×1440
+        720×360 DPI microweave and softweave, 720 DPI microweave
+        and softweave, 1440×720 microweave and softweave,
+        2880×720 microweave and softweave, and 2880×1440
         softweave only.  Printer weaving is referred to as
-        “microweave� for historical reasons.
+        &#8220;microweave&#8221; for historical reasons.
       </P
 ><P
 >&#13;        For the dot sizes, the value for each element in the vector
@@ -587,28 +581,28 @@ CLASS="constant"
 CLASS="constant"
 >0x10</CODE
 > usually works best at
-        1440×720 and <CODE
+        1440×720 and <CODE
 CLASS="constant"
 >0x11</CODE
 > works best at
-        720×720.  Unfortunately, <CODE
+        720×720.  Unfortunately, <CODE
 CLASS="constant"
 >0x10</CODE
 >
         doesn't seem to generate quite enough density at
-        720×720, because if it did the output would be very
-        smooth.  Perhaps it's possible to tweak things…
+        720×720, because if it did the output would be very
+        smooth.  Perhaps it's possible to tweak things&#8230;
       </P
 ><P
 >&#13;        The list of densities is a list of base density values for all
-        of the above listed modes.  “Density� refers to
+        of the above listed modes.  &#8220;Density&#8221; refers to
         the amount of ink deposited when a solid color (or solid
         black) is printed.  So if the density is
         <CODE
 CLASS="constant"
 >0.5</CODE
 >, solid black actually prints only
-        half the possible dots.  “Base density� refers to
+        half the possible dots.  &#8220;Base density&#8221; refers to
         the fact that the density value can be scaled in the GUI or on
         the Ghostscript command line.  The density value specified
         (which is not made visible to the user) is multiplied by the
@@ -632,8 +626,8 @@ CLASS="constant"
         density value that results in solid black (no visible gaps
         under a fairly high power magnifying glass or loupe).  If an
         appropriate density value is found for 720 DPI, it could be
-        divided by 2 for 1440×720, by 4 for 2880×720, and
-        by 8 for 2880×1440.
+        divided by 2 for 1440×720, by 4 for 2880×720, and
+        by 8 for 2880×1440.
       </P
 ><P
 >&#13;        However, for printers that offer a choice of dot size, this
@@ -651,7 +645,7 @@ CLASS="constant"
 >&#13;        The last member is a pointer to a structure containing a list
         of ink values for variable dot size (or 6 color) inks.  We
         model variable dot size inks as producing a certain
-        “value� of ink for each available dot size, where
+        &#8220;value&#8221; of ink for each available dot size, where
         the largest dot size has a value of <CODE
 CLASS="constant"
 >1</CODE
@@ -810,7 +804,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN403"
->Tuning the printer</A
+>4.2.2. Tuning the printer</A
 ></H2
 ><P
 >&#13;        Now, how do you use all this to tune a printer?  There are a
@@ -983,7 +977,7 @@ CLASS="emphasis"
         credit, so too much cyan and magenta is deposited, which
         overwhelms the yellow).  Make sure you do this on very white,
         very high grade inkjet paper that's designed for
-        1440×720 DPI or higher; otherwise the ink will spread on
+        1440×720 DPI or higher; otherwise the ink will spread on
         contact and you'll get values that aren't really true for high
         grade paper.  You can, of course, calibrate for low grade
         paper if that's what you're going to use, but that shouldn't
@@ -1006,7 +1000,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN433"
->Canon inkjet printers</A
+>4.2.3. Canon inkjet printers</A
 ></H2
 ><P
 >&#13;        Basically, a new Canon printer can be added to
@@ -1018,8 +1012,8 @@ CLASS="filename"
         differences are noted here.
       </P
 ><P
->&#13;        In general, Canon printers have more “built-in
-        intelligence“ than Epson printers which results in the
+>&#13;        In general, Canon printers have more &#8220;built-in
+        intelligence&#8220; than Epson printers which results in the
         fact that the driver only has to tell the printing conditions
         like resolutions, dot sizes, etc. to the printer and
         afterwards transfer the raster data line by line for each
@@ -1038,12 +1032,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN440"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >typedef struct canon_caps {
@@ -1065,9 +1053,6 @@ canon_dot_size_t dot_sizes;   /* Vector of dot sizes for resolutions */
 canon_densities_t densities;  /* List of densities for each printer */
 canon_variable_inklist_t *inxs; /* Choices of inks for this printer */
 } canon_cap_t;</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -1075,11 +1060,11 @@ canon_variable_inklist_t *inxs; /* Choices of inks for this printer */
 >&#13;        Since there are Canon printers which print in resolutions of
         2<SUP
 >n</SUP
-> × 150 DPI (e.g. 300, 600,
+> × 150 DPI (e.g. 300, 600,
         1200) and others which support resolutions of
         2<SUP
 >n</SUP
-> × 180 DPI (e.g. 360, 720,
+> × 180 DPI (e.g. 360, 720,
         1440), there's a base resolution (150 or 180, respectively)
         given in the <SPAN
 CLASS="type"
@@ -1143,12 +1128,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN458"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >static const canon_variable_inklist_t canon_ink_myinks[] =
@@ -1164,20 +1143,17 @@ CLASS="programlisting"
   &#38;ci_CMYK_3, &#38;ci_CMYK_3, &#38;ci_CMYK_3,
 },
 };</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;        where the <VAR
+>&#13;        where the <TT
 CLASS="literal"
->&#38;ci_CMYK_1</VAR
+>&#38;ci_CMYK_1</TT
 > and
-        <VAR
+        <TT
 CLASS="literal"
->&#38;ci_CMYK_3</VAR
+>&#38;ci_CMYK_3</TT
 > entries are references to a
         previously defined const of type
         <SPAN
@@ -1212,7 +1188,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x67.html b/doc/developer/reference-html/x67.html
index db78e88..425a70b 100644
--- a/doc/developer/reference-html/x67.html
+++ b/doc/developer/reference-html/x67.html
@@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Linking with libgutenprint</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="Using libgutenprint"
 HREF="c48.html"><LINK
@@ -17,11 +17,14 @@ TITLE="Using libgutenprint"
 HREF="c48.html"><LINK
 REL="NEXT"
 TITLE="Integrating libgutenprint"
-HREF="x79.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x79.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -71,13 +74,13 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN67"
->Linking with libgutenprint</A
+>2.2. Linking with libgutenprint</A
 ></H1
 ><P
 >&#13;      To link a program with libgutenprint, the option
-      <VAR
+      <CODE
 CLASS="option"
->-lgutenprint</VAR
+>-lgutenprint</CODE
 > needs to be passed to the compiler
       when linking. For example, to compile and link
       <TT
@@ -86,12 +89,6 @@ CLASS="filename"
 > the following commands would be
       used:
     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -108,9 +105,6 @@ CLASS="prompt"
 CLASS="userinput"
 >gcc -o stpimage -lgutenprint stpimage.o</KBD
 ></PRE
-></TD
-></TR
-></TABLE
 ><P
 >&#13;      The compiler and linker flags needed may vary depending on the
       options Gutenprint was configured with when it was built. The
@@ -146,7 +140,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x79.html b/doc/developer/reference-html/x79.html
index f387523..ac4968b 100644
--- a/doc/developer/reference-html/x79.html
+++ b/doc/developer/reference-html/x79.html
@@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Integrating libgutenprint</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="Using libgutenprint"
 HREF="c48.html"><LINK
@@ -17,11 +17,14 @@ TITLE="Linking with libgutenprint"
 HREF="x67.html"><LINK
 REL="NEXT"
 TITLE="Reporting Bugs"
-HREF="c194.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="c194.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -71,7 +74,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN79"
->Integrating libgutenprint</A
+>2.3. Integrating libgutenprint</A
 ></H1
 ><P
 >&#13;      This section describes how to integrate the compiling and
@@ -99,7 +102,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN86"
-><B
+>2.3.1. <B
 CLASS="command"
 >pkg-config</B
 ></A
@@ -111,13 +114,13 @@ CLASS="command"
 CLASS="command"
 >configure</B
 > when configuring the package when
-	it was built, the <VAR
+	it was built, the <CODE
 CLASS="varname"
->CFLAGS</VAR
+>CFLAGS</CODE
 > and
-	<VAR
+	<CODE
 CLASS="varname"
->LIBS</VAR
+>LIBS</CODE
 > parameters needed to compile and link
 	programs with libgutenprint may vary.  To make it simple to
 	determine what these are on any given system, a
@@ -140,21 +143,15 @@ CLASS="refentrytitle"
 > manual page for a compete synopsis.
       </P
 ><P
->&#13;	The correct <VAR
+>&#13;	The correct <CODE
 CLASS="varname"
->CFLAGS</VAR
+>CFLAGS</CODE
 > to use can be obtained
-	with the <VAR
+	with the <CODE
 CLASS="option"
->--cflags</VAR
+>--cflags</CODE
 > option:
       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -165,25 +162,16 @@ CLASS="userinput"
 >pkg-config --cflags gutenprint</KBD
 >
 -I/usr/local/include</PRE
-></TD
-></TR
-></TABLE
 ><P
->&#13;	The correct <VAR
+>&#13;	The correct <CODE
 CLASS="varname"
->LIBS</VAR
+>LIBS</CODE
 > to use can the obtained
-	with the <VAR
+	with the <CODE
 CLASS="option"
->--libs</VAR
+>--libs</CODE
 > option:
       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -194,22 +182,13 @@ CLASS="userinput"
 >pkg-config --libs gutenprint</KBD
 >
 -L/usr/local/lib -lgutenprint -lm -ldl</PRE
-></TD
-></TR
-></TABLE
 ><P
 >&#13;        Lastly, the installed version of Gutenprint can be obtained with the
-	<VAR
+	<CODE
 CLASS="varname"
->--version</VAR
+>--version</CODE
 > option:
       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -220,19 +199,10 @@ CLASS="userinput"
 >pkg-config --modversion gutenprint</KBD
 >
 4.3.23</PRE
-></TD
-></TR
-></TABLE
 ><P
 >&#13;	The command can be used from the shell by enclosing it in
-	backquotes ‘`’:
+	backquotes &#8216;`&#8217;:
       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 ><SAMP
@@ -250,9 +220,6 @@ CLASS="userinput"
 >gcc `pkg-config --libs gutenprint` -o
   stpimage stpimage.o</KBD
 ></PRE
-></TD
-></TR
-></TABLE
 ><P
 >&#13;	However, this is not the way it it typically used. Normally
 	it is used in a <TT
@@ -271,7 +238,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN123"
-><B
+>2.3.2. <B
 CLASS="command"
 >make</B
 ></A
@@ -292,20 +259,11 @@ CLASS="command"
 >make</B
 >:
       </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >GUTENPRINT_VERSION = $(shell pkg-config --version gutenprint)
 GUTENPRINT_CFLAGS = $(shell pkg-config --cflags gutenprint)
 GUTENPRINT_LIBS = $(shell pkg-config --libs gutenprint)</PRE
-></TD
-></TR
-></TABLE
 ><P
 >&#13;	How you choose to use these variables is entirely up to
 	you. See the GNU <B
@@ -321,7 +279,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN133"
-><B
+>2.3.3. <B
 CLASS="command"
 >autoconf</B
 ></A
@@ -347,7 +305,7 @@ CLASS="filename"
 CLASS="command"
 >autoconf</B
 > expands
-	the m4 macros into ‘real’ shell script.  The
+	the m4 macros into &#8216;real&#8217; shell script.  The
 	resulting <B
 CLASS="command"
 >configure</B
@@ -384,18 +342,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN148"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
 >PKG_CHECK_MODULES(GUTENPRINT, gutenprint)</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -406,7 +355,7 @@ CLASS="sect2"
 CLASS="sect2"
 ><A
 NAME="AEN150"
-><B
+>2.3.4. <B
 CLASS="command"
 >automake</B
 ></A
@@ -490,26 +439,26 @@ CLASS="filename"
 CLASS="filename"
 >Makefile.in</TT
 > files such as
-	<VAR
+	<CODE
 CLASS="option"
->dist</VAR
->, <VAR
+>dist</CODE
+>, <CODE
 CLASS="option"
->distcheck</VAR
+>distcheck</CODE
 >,
-	<VAR
+	<CODE
 CLASS="option"
->clean</VAR
->, <VAR
+>clean</CODE
+>, <CODE
 CLASS="option"
->distclean</VAR
+>distclean</CODE
 >,
-	<VAR
+	<CODE
 CLASS="option"
->maintainer-clean</VAR
-> and <VAR
+>maintainer-clean</CODE
+> and <CODE
 CLASS="option"
->tags</VAR
+>tags</CODE
 >,
 	and there are many more more available.  See the GNU
 	<B
@@ -526,13 +475,13 @@ CLASS="function"
 CLASS="function"
 >AC_SUBST</CODE
 > to substitute
-	<VAR
+	<CODE
 CLASS="varname"
->GUTENPRINT_CFLAGS</VAR
+>GUTENPRINT_CFLAGS</CODE
 > and
-	<VAR
+	<CODE
 CLASS="varname"
->GUTENPRINT_LIBS</VAR
+>GUTENPRINT_LIBS</CODE
 >, <B
 CLASS="command"
 >automake</B
@@ -566,18 +515,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN189"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="programlisting"
->AUTOMAKE_OPTIONS = 1.7 gnu
-MAINT_CHARSET = latin1
-
-@SET_MAKE@
+>@SET_MAKE@
 
 AM_CFLAGS = $(GUTENPRINT_CFLAGS)
 
@@ -586,9 +526,6 @@ stpimage_SOURCES = stpimage.c
 stpimage_LDADD = $(GUTENPRINT_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -630,7 +567,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/reference-html/x955.html b/doc/developer/reference-html/x955.html
index 25d7881..bc3f395 100644
--- a/doc/developer/reference-html/x955.html
+++ b/doc/developer/reference-html/x955.html
@@ -1,14 +1,14 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
 <HTML
 ><HEAD
 ><TITLE
 >Remote Mode Commands</TITLE
 ><META
 NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
 REL="HOME"
 TITLE="The Developer's Guide to Gutenprint"
-HREF="book1.html"><LINK
+HREF="index.html"><LINK
 REL="UP"
 TITLE="ESC/P2"
 HREF="c464.html"><LINK
@@ -17,11 +17,14 @@ TITLE="ESC/P2"
 HREF="c464.html"><LINK
 REL="NEXT"
 TITLE="Appropriate Remote Commands"
-HREF="x1669.html"><META
-http-equiv="Content-Type"
-content="text/html; charset=UTF-8"></HEAD
+HREF="x1669.html"></HEAD
 ><BODY
 CLASS="sect1"
+BGCOLOR="#FFFFFF"
+TEXT="#000000"
+LINK="#0000FF"
+VLINK="#840084"
+ALINK="#0000FF"
 ><DIV
 CLASS="NAVHEADER"
 ><TABLE
@@ -71,7 +74,7 @@ CLASS="sect1"
 CLASS="sect1"
 ><A
 NAME="AEN955"
->Remote Mode Commands</A
+>5.2. Remote Mode Commands</A
 ></H1
 ><P
 >&#13;    The following description of remote commands comes out of an
@@ -93,18 +96,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN959"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >ESC (R BC=8 00 R E M O T E 1</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -119,26 +113,17 @@ CLASS="informalexample"
 ><A
 NAME="AEN962"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >ESC 00 00 00</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
 >&#13;    All remote mode commands must be sent before the initial
-    <VAR
+    <TT
 CLASS="literal"
->ESC (G</VAR
+>ESC (G</TT
 > command is sent.
   </P
 ><P
@@ -178,13 +163,13 @@ CLASS="variablelist"
 ></P
 ><DL
 ><DT
-><VAR
+><TT
 CLASS="literal"
->NC <VAR
+>NC <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-          00</VAR
+          00</TT
 ></DT
 ><DD
 ><P
@@ -192,18 +177,18 @@ CLASS="varname"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->VI <VAR
+>VI <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-          00</VAR
+          00</TT
 ></DT
 ><DD
 ><P
->&#13;          On my 740, prints the following, probably “version
-          information�:
+>&#13;          On my 740, prints the following, probably &#8220;version
+          information&#8221;:
         </P
 ><DIV
 CLASS="informalexample"
@@ -212,33 +197,24 @@ CLASS="informalexample"
 ><A
 NAME="AEN989"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >W01286 I02382\r\n</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* AI <VAR
+>* AI <CODE
 CLASS="varname"
->BC</VAR
->=3 00 00 00</VAR
+>BC</CODE
+>=3 00 00 00</TT
 ></DT
 ><DD
 ><P
->&#13;          Prints a “printer ID�.  On one 870, prints the
+>&#13;          Prints a &#8220;printer ID&#8221;.  On one 870, prints the
           following:
         </P
 ><DIV
@@ -248,18 +224,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN997"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >51-51-50-51-49-48\r\n</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -269,12 +236,12 @@ CLASS="screen"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* LD <VAR
+>* LD <CODE
 CLASS="varname"
->BC</VAR
->=0</VAR
+>BC</CODE
+>=0</TT
 ></DT
 ><DD
 ><P
@@ -282,30 +249,30 @@ CLASS="varname"
           ROM. This apparently does not load factory defaults per
           se, but any settings that are saved.  This is commonly
           used right at the end of each print job after the
-          <VAR
+          <TT
 CLASS="literal"
->ESC @</VAR
+>ESC @</TT
 > printer reset command.
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* CH <VAR
+>* CH <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;          Perform a head cleaning cycle.  The heads to clean are
-          determined by parameter <VAR
+          determined by parameter <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >:
       </P
 ><DIV
@@ -327,9 +294,9 @@ WIDTH="1*"
 TITLE="description"><THEAD
 ><TR
 ><TH
-><VAR
+><CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 ></TH
 ><TH
 >Description</TH
@@ -367,16 +334,16 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;          While <VAR
+>&#13;          While <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > = <CODE
 CLASS="constant"
 >00</CODE
 > is
-          likely supported by all printers, <VAR
+          likely supported by all printers, <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >
           = <CODE
 CLASS="constant"
@@ -389,24 +356,24 @@ CLASS="constant"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* DT <VAR
+>* DT <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=3 00
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
-> 00</VAR
+>xx</CODE
+> 00</TT
 ></DT
 ><DD
 ><P
 >&#13;          Print an alignment pattern.  There are three patterns,
           which are picked via the choice of
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >.  Pattern <CODE
 CLASS="constant"
 >0</CODE
@@ -422,27 +389,27 @@ CLASS="constant"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* DA <VAR
+>* DA <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4 00
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > 00
-          <VAR
+          <CODE
 CLASS="varname"
->yy</VAR
-></VAR
+>yy</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;          Set results for the alignment pattern.
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is the pattern
           (<CODE
 CLASS="constant"
@@ -451,9 +418,9 @@ CLASS="constant"
 CLASS="constant"
 >3</CODE
 >);
-          <VAR
+          <CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 > is the best choice from the set
           (<CODE
 CLASS="constant"
@@ -474,12 +441,12 @@ CLASS="constant"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* SV <VAR
+>* SV <CODE
 CLASS="varname"
->BC</VAR
->=0</VAR
+>BC</CODE
+>=0</TT
 ></DT
 ><DD
 ><P
@@ -487,13 +454,13 @@ CLASS="varname"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* RS <VAR
+>* RS <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-          01</VAR
+          01</TT
 ></DT
 ><DD
 ><P
@@ -501,13 +468,13 @@ CLASS="varname"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* IQ <VAR
+>* IQ <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-          01</VAR
+          01</TT
 ></DT
 ><DD
 ><P
@@ -521,18 +488,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN1089"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >IQ:KKCCMMYY</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -546,18 +504,9 @@ CLASS="informalexample"
 ><A
 NAME="AEN1092"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >IQ:KKCCMMYYccmm</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
@@ -578,16 +527,16 @@ CLASS="screen"
 CLASS="variablelist"
 ><DL
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* IR <VAR
+>* IR <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
@@ -599,36 +548,36 @@ CLASS="emphasis"
 ></SPAN
 >.  This command has
           been observed on an STP 870 with
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >03</CODE
 > at the start
-          of a job and <VAR
+          of a job and <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >02</CODE
 >
           at the end of a job (where it is followed by an
-          <VAR
+          <TT
 CLASS="literal"
->LD</VAR
+>LD</TT
 > command).  When in roll mode, the
           values change to
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >01</CODE
 > at the start
-          of a job and <VAR
+          of a job and <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
@@ -637,23 +586,23 @@ CLASS="constant"
         </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* FP <VAR
+>* FP <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=3 00
-          <VAR
+          <CODE
 CLASS="varname"
->pos</VAR
->[2]</VAR
+>pos</CODE
+>[2]</TT
 ></DT
 ><DD
 ><P
 >&#13;          Specify the horizontal left margin in units of 1/360 inch.
-          The default value for <VAR
+          The default value for <CODE
 CLASS="varname"
->pos</VAR
+>pos</CODE
 > is
           <CODE
 CLASS="constant"
@@ -683,38 +632,38 @@ CLASS="constant"
 CLASS="variablelist"
 ><DL
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* SN <VAR
+>* SN <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=3 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-> <VAR
+>xx</CODE
+> <CODE
 CLASS="varname"
->yy</VAR
-></VAR
+>yy</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Select Mechanism Sequence.  <VAR
+>&#13;            Select Mechanism Sequence.  <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >
             controls which sub-operation is performed.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
 > selects
-            the “Feed paper sequence setting�.
-            <VAR
+            the &#8220;Feed paper sequence setting&#8221;.
+            <CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 > can take on the following values
             (on the STP 870, at any rate):
           </P
@@ -737,9 +686,9 @@ WIDTH="1*"
 TITLE="description"><THEAD
 ><TR
 ><TH
-><VAR
+><CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 ></TH
 ><TH
 >Media type</TH
@@ -841,24 +790,24 @@ CLASS="constant"
             presumably to tune it for different types of paper.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >01</CODE
 > controls
             the platen gap setting;
-            <VAR
+            <CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
 > is the
-            default, <VAR
+            default, <CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 >=<CODE
 CLASS="constant"
 >1</CODE
@@ -869,17 +818,17 @@ CLASS="constant"
 > are higher settings.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >02</CODE
 > controls
             paper loading speed
-            (<VAR
+            (<CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 >=<CODE
 CLASS="constant"
 >0</CODE
@@ -895,12 +844,12 @@ CLASS="constant"
 CLASS="constant"
 >1</CODE
 > is
-            used when printing on “plain paper�,
-            “360dpi ink jet paper� or “ink jet
-            transparencies�, and
-            <VAR
+            used when printing on &#8220;plain paper&#8221;,
+            &#8220;360dpi ink jet paper&#8221; or &#8220;ink jet
+            transparencies&#8221;, and
+            <CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
@@ -908,35 +857,35 @@ CLASS="constant"
             other paper type settings.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >07</CODE
 > controls
             duplex printing for printers with that capability
-            (<VAR
+            (<CODE
 CLASS="varname"
->yy</VAR
->=<VAR
+>yy</CODE
+>=<CODE
 CLASS="varname"
->0</VAR
+>0</CODE
 > is default,
             for non-duplex printing; <CODE
 CLASS="constant"
 >1</CODE
 > is front
-            side of the paper, and <VAR
+            side of the paper, and <CODE
 CLASS="varname"
->2</VAR
+>2</CODE
 > is back
             side).
           </P
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >09</CODE
@@ -944,9 +893,9 @@ CLASS="constant"
             zero margin printing on the printers with the capability
             of printing zero-margin on all sides (Stylus Photo
             780/790, 890, and 1280/1290).
-            <VAR
+            <CODE
 CLASS="varname"
->yy</VAR
+>yy</CODE
 >=<CODE
 CLASS="constant"
 >0</CODE
@@ -959,80 +908,80 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* PP <VAR
+>* PP <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=3 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->yy</VAR
-></VAR
+>yy</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set Paper Path.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >2</CODE
 > indicates
             manual feed,
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >3</CODE
 > is for roll
-            paper.  <VAR
+            paper.  <CODE
 CLASS="varname"
->yy</VAR
-> selects “paper path
-            number�.
+>yy</CODE
+> selects &#8220;paper path
+            number&#8221;.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* AC <VAR
+>* AC <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set Auto Cutting State.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >0</CODE
 > selects
             auto cutting off,
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >1</CODE
 > selects
             auto cutting on, and
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >2</CODE
@@ -1047,74 +996,74 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* DR <VAR
+>* DR <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=4 00 xx
-            <VAR
+            <CODE
 CLASS="varname"
->DT2</VAR
-></VAR
+>DT2</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set Drying Time.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
 > sets the
-            drying time “per scan� (per pass?);
-            <VAR
+            drying time &#8220;per scan&#8221; (per pass?);
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >01</CODE
 > sets the
-            drying time per page. <VAR
+            drying time per page. <CODE
 CLASS="varname"
->DT</VAR
+>DT</CODE
 > indicates
             the drying time, which is in seconds if page mode is
             used and in milliseconds if scan mode is used.
-            <VAR
+            <CODE
 CLASS="varname"
->DT</VAR
+>DT</CODE
 > must not exceed 3600 seconds in
             per-page mode and 10000 milliseconds in per-scan mode.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* IK <VAR
+>* IK <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Select Ink Type.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
 > selects
             dye ink.  Pigment ink is apparently selected by
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >01</CODE
@@ -1123,24 +1072,24 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* PZ BC=2 00 xx</VAR
+>* PZ BC=2 00 xx</TT
 ></DT
 ><DD
 ><P
 >&#13;            Set Pause After Printing.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
 > selects no
             pause after printing;
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >01</CODE
@@ -1159,30 +1108,30 @@ CLASS="emphasis"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* EX <VAR
+>* EX <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=6 00 00 00 00 0x14
-          <VAR
+          <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Set Vertical Print Page Line Mode.
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >00</CODE
 > is off,
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >=<CODE
 CLASS="constant"
 >01</CODE
@@ -1192,30 +1141,30 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* EX <VAR
+>* EX <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=6 00 00 00 00 0x05
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set Roll Paper Mode.  If <VAR
+>&#13;            Set Roll Paper Mode.  If <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is
             <CODE
 CLASS="constant"
 >0</CODE
 >, roll paper mode is off; if
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is <CODE
 CLASS="constant"
 >1</CODE
@@ -1224,70 +1173,70 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* EX <VAR
+>* EX <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=3 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-> <VAR
+>xx</CODE
+> <CODE
 CLASS="varname"
->yy</VAR
-></VAR
+>yy</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Appears to be a synonym for the <VAR
+>&#13;            Appears to be a synonym for the <TT
 CLASS="literal"
->SN</VAR
+>SN</TT
 >
             command described above.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* PH <VAR
+>* PH <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Select Paper Thickness.  Set the paper thickness
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > in .1 mm units.  This must not
             exceed <CODE
 CLASS="constant"
 >0x10</CODE
 > (1.6 mm).  If the
-            thickness is set “more than� .6 mm (which
-            probably means “at least� 0.6 mm, since the
-            other case reads “less than 0.5 mm�), the
+            thickness is set &#8220;more than&#8221; .6 mm (which
+            probably means &#8220;at least&#8221; 0.6 mm, since the
+            other case reads &#8220;less than 0.5 mm&#8221;), the
             platen gap is set high irrespective of the
-            <VAR
+            <TT
 CLASS="literal"
->SN</VAR
+>SN</TT
 > command.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* PM <VAR
+>* PM <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            00</VAR
+            00</TT
 ></DT
 ><DD
 ><P
@@ -1303,27 +1252,27 @@ CLASS="emphasis"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* ST <VAR
+>* ST <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
 >&#13;            Epson's STP 750/1200 programming guide refers to the
-            <VAR
+            <TT
 CLASS="literal"
->ST</VAR
-> command as “Set printer
-            state reply�.  If <VAR
+>ST</TT
+> command as &#8220;Set printer
+            state reply&#8221;.  If <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is
             <CODE
 CLASS="constant"
@@ -1333,9 +1282,9 @@ CLASS="constant"
 >2</CODE
 >, the
             printer will not send status replies.  If
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is <CODE
 CLASS="constant"
 >1</CODE
@@ -1357,12 +1306,6 @@ CLASS="informalexample"
 ><A
 NAME="AEN1341"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >@BDC ST\r
@@ -1375,30 +1318,27 @@ AI:CW:02kkccmmyy, MI:mm
 [TC:tttt;]
 INK:...;
 \f</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;            (<VAR
+>&#13;            (<TT
 CLASS="literal"
->\r</VAR
+>\r</TT
 > is carriage return;
-            <VAR
+            <TT
 CLASS="literal"
->\n</VAR
-> is newline; <VAR
+>\n</TT
+> is newline; <TT
 CLASS="literal"
->\f</VAR
+>\f</TT
 >
             is formfeed.)
           </P
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->ST</VAR
+>ST</TT
 > is the printer status:
           </P
 ><DIV
@@ -1493,9 +1433,9 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->ER</VAR
+>ER</TT
 >, if provided, is the error status:
           </P
 ><DIV
@@ -1644,9 +1584,9 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->IQ</VAR
+>IQ</TT
 > is the amount of ink left, as a
             (decimal!)  percentage expressed in hexadecimal.  The
             values are black, cyan, magenta, and yellow.  6 and 7
@@ -1727,9 +1667,9 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->WR</VAR
+>WR</TT
 >, if provided, is the warning status:
           </P
 ><DIV
@@ -1765,7 +1705,7 @@ CLASS="constant"
 ></TD
 ><TD
 >&#13;                    Black ink low (Photo black on printers using
-                    UltraChrome® ink)
+                    UltraChrome® ink)
                   </TD
 ></TR
 ><TR
@@ -1845,41 +1785,41 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->RV</VAR
+>RV</TT
 > is the firmware revision (one byte
             ASCII).
           </P
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->AI</VAR
+>AI</TT
 > is actuator information.  These
             are two byte ASCII codes that indicate ``ink weight rank
             ID'' of KCMY, respectively.
           </P
 ><P
->&#13;          <VAR
+>&#13;          <TT
 CLASS="literal"
->TC</VAR
+>TC</TT
 >, if provided, is the total time of
           cleaning or ink filling (?).
           </P
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->RC</VAR
+>RC</TT
 >, if provided, is the firmware
             revision.
           </P
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->INK:</VAR
-> and <VAR
+>INK:</TT
+> and <TT
 CLASS="literal"
->MI</VAR
+>MI</TT
 > are
             <SPAN
 CLASS="emphasis"
@@ -1891,26 +1831,26 @@ CLASS="emphasis"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* SM <VAR
+>* SM <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            <VAR
+            <CODE
 CLASS="varname"
->xx</VAR
-></VAR
+>xx</CODE
+></TT
 ></DT
 ><DD
 ><P
->&#13;            Set Status Reply Rate.  <VAR
+>&#13;            Set Status Reply Rate.  <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is the
-            repeat interval in seconds.  If <VAR
+            repeat interval in seconds.  If <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > is
             <CODE
 CLASS="constant"
@@ -1920,13 +1860,13 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* ST <VAR
+>* ST <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            01</VAR
+            01</TT
 ></DT
 ><DD
 ><P
@@ -1939,39 +1879,30 @@ CLASS="informalexample"
 ><A
 NAME="AEN1556"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
->@BDC PS\r\nST:<VAR
+>@BDC PS\r\nST:<CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >;\f</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->\r</VAR
+>\r</TT
 > is carriage return;
-            <VAR
+            <TT
 CLASS="literal"
->\n</VAR
-> is newline; <VAR
+>\n</TT
+> is newline; <TT
 CLASS="literal"
->\f</VAR
+>\f</TT
 > is
-            formfeed).  If <VAR
+            formfeed).  If <CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 > (the reply value) is
             <CODE
 CLASS="constant"
@@ -1992,13 +1923,13 @@ CLASS="constant"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* SM <VAR
+>* SM <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            01</VAR
+            01</TT
 ></DT
 ><DD
 ><P
@@ -2012,63 +1943,54 @@ CLASS="informalexample"
 ><A
 NAME="AEN1574"
 ></A
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
 ><PRE
 CLASS="screen"
 >@BDC PS\r\nST:xx;\f</PRE
-></TD
-></TR
-></TABLE
 ><P
 ></P
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <TT
 CLASS="literal"
->\r</VAR
+>\r</TT
 > is carriage return;
-            <VAR
+            <TT
 CLASS="literal"
->\n</VAR
-> is newline; <VAR
+>\n</TT
+> is newline; <TT
 CLASS="literal"
->\f</VAR
+>\f</TT
 > is
-            formfeed).  See <VAR
+            formfeed).  See <TT
 CLASS="literal"
 >SM
-              <VAR
+              <CODE
 CLASS="varname"
->BC</VAR
->=2</VAR
+>BC</CODE
+>=2</TT
 > above for the meaning of
             the return value.
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
 >* ??
-            <VAR
+            <CODE
 CLASS="varname"
->BC</VAR
->=<VAR
+>BC</CODE
+>=<CODE
 CLASS="varname"
->xx</VAR
+>xx</CODE
 >
-            <VAR
+            <CODE
 CLASS="varname"
->y</VAR
->[1] …
-            <VAR
+>y</CODE
+>[1] &#8230;
+            <CODE
 CLASS="varname"
->y</VAR
->[xx]</VAR
+>y</CODE
+>[xx]</TT
 ></DT
 ><DD
 ><P
@@ -2076,31 +1998,31 @@ CLASS="varname"
             Commands).  The command string is executed (it would
             appear from the documentation), and the string sent is
             returned using a sequence similar to that described in
-            the <VAR
+            the <TT
 CLASS="literal"
->ST <VAR
+>ST <CODE
 CLASS="varname"
->BC</VAR
->=1</VAR
+>BC</CODE
+>=1</TT
 > and
-            <VAR
+            <TT
 CLASS="literal"
->SM <VAR
+>SM <CODE
 CLASS="varname"
->BC</VAR
->=1</VAR
+>BC</CODE
+>=1</TT
 > commands.
             Note that in this case the number of bytes is variable!
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* SM <VAR
+>* SM <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=2 00
-            02</VAR
+            02</TT
 ></DT
 ><DD
 ><P
@@ -2115,13 +2037,13 @@ CLASS="emphasis"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* JE <VAR
+>* JE <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=1
-            00</VAR
+            00</TT
 ></DT
 ><DD
 ><P
@@ -2143,38 +2065,38 @@ CLASS="emphasis"
           </P
 ></DD
 ><DT
-><VAR
+><TT
 CLASS="literal"
->* CO <VAR
+>* CO <CODE
 CLASS="varname"
->BC</VAR
+>BC</CODE
 >=8 00
-            <VAR
+            <CODE
 CLASS="varname"
->cutter</VAR
->[1] <VAR
+>cutter</CODE
+>[1] <CODE
 CLASS="varname"
->page</VAR
+>page</CODE
 >[1]
-            <VAR
+            <CODE
 CLASS="varname"
->unit</VAR
+>unit</CODE
 >[1]
-            <VAR
+            <CODE
 CLASS="varname"
->position</VAR
->[4]</VAR
+>position</CODE
+>[4]</TT
 ></DT
 ><DD
 ><P
 >&#13;            Specify paper cutting on Stylus Photo 2200 (and perhaps
-            some other printers).  <VAR
+            some other printers).  <CODE
 CLASS="varname"
->cutter</VAR
+>cutter</CODE
 > must be
-            0.  <VAR
+            0.  <CODE
 CLASS="varname"
->page</VAR
+>page</CODE
 > should be one of the
             following:
           </P
@@ -2234,9 +2156,9 @@ CLASS="constant"
 ></TABLE
 ></DIV
 ><P
->&#13;            <VAR
+>&#13;            <CODE
 CLASS="varname"
->unit</VAR
+>unit</CODE
 > should be one of the following:
           </P
 ><DIV
@@ -2296,9 +2218,9 @@ CLASS="constant"
 ></DIV
 ><P
 >&#13;            This command should be used twice.  The first
-            <VAR
+            <TT
 CLASS="literal"
->CO</VAR
+>CO</TT
 > command specifies where the page
             will be cut at the top, and the second specifies where
             the page will be cut at the bottom.  This permits
@@ -2333,7 +2255,7 @@ WIDTH="34%"
 ALIGN="center"
 VALIGN="top"
 ><A
-HREF="book1.html"
+HREF="index.html"
 ACCESSKEY="H"
 >Home</A
 ></TD
diff --git a/doc/developer/using.xml b/doc/developer/using.xml
index c63ca7a..e192633 100644
--- a/doc/developer/using.xml
+++ b/doc/developer/using.xml
@@ -215,10 +215,7 @@ GUTENPRINT_LIBS = $(shell pkg-config --libs gutenprint)</programlisting>
 	write a <filename>Makefile.am</filename> to do this:
       </para>
       <informalexample>
-        <programlisting>AUTOMAKE_OPTIONS = 1.7 gnu
-MAINT_CHARSET = latin1
-
-@SET_MAKE@
+        <programlisting>@SET_MAKE@
 
 AM_CFLAGS = $(GUTENPRINT_CFLAGS)
 
diff --git a/doc/gutenprint/gutenprint.tag b/doc/gutenprint/gutenprint.tag
index 1008170..dede246 100644
--- a/doc/gutenprint/gutenprint.tag
+++ b/doc/gutenprint/gutenprint.tag
@@ -2,324 +2,324 @@
 <tagfile>
   <compound kind="file">
     <name>array.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>array_8h</filename>
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <member kind="typedef">
       <type>stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g69e0971771118ccea2a5dc72ba4fa73e</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gaf63aaff6ea861e16b3addc023ef2e66</anchor>
       <arglist>(int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_destroy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g562ad19d8ecc1e9bdd8c182b0a05ecec</anchor>
       <arglist>(stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gab9b031be229d8762faf46a3ef9454ec</anchor>
       <arglist>(stp_array_t *dest, const stp_array_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g19370f7d4779013904be75bc3d97e024</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g698e51815f2ef3fd0709d6b32a2bb921</anchor>
       <arglist>(stp_array_t *array, int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g48e34b2673c2973884f0a403bafe7ea8</anchor>
       <arglist>(const stp_array_t *array, int *x_size, int *y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g0ca3891b4cde193cc65de63053e3f4fa</anchor>
       <arglist>(stp_array_t *array, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g9e1c46379b5935ed3a939833bd9e68be</anchor>
       <arglist>(const stp_array_t *array, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_set_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g4ab405205d678a3d9ae02a98103fbfea</anchor>
       <arglist>(stp_array_t *array, int x, int y, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_get_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gb9d53cf70f2c892dca82b8db2414fad2</anchor>
       <arglist>(const stp_array_t *array, int x, int y, double *data)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_array_get_sequence</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g2051c3f4a1eaccb198744f8d7c76d649</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>bit-ops.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>bit-ops_8h</filename>
     <member kind="function">
       <type>void</type>
       <name>stp_fold</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>ec711fffd61ebd40a6896d76d4c9327f</anchor>
       <arglist>(const unsigned char *line, int single_height, unsigned char *outbuf)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_split_2</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>65a4f2dc6c49d8a80e1d0ca72a1f0ffd</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_split_4</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>24f21e067782cbb1606f4109f7acaccb</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_2</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>9772ac792d8208e341d780fc756bf3cd</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_4</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>7fdd081b1a58cdc3648e61d23aefb744</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_8</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>534a4a10cda717aabaf212954cc2d891</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unpack_16</name>
       <anchorfile>bit-ops_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>d472146a7bdf6c1e95bcb102c4409515</anchor>
       <arglist>(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>channel.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>channel_8h</filename>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_reset</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>dc5c0cc7cc331da0ab394b642a381363</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_reset_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>6a88eb8e1f968370b63326e517a34ec2</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_add</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>6a552629f3dddf6283f605e1961dd04f</anchor>
       <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_value</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>73265490d8c513de68604a982ec49e0a</anchor>
       <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_density_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>99f818da3b4944b328de9de860d04dbc</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel, double adjustment)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_density_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>0cfa6ae42ced76291f96ff64fed6a823</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_ink_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>9351c3b60ed0f43e012bbd2906b0f0b4</anchor>
       <arglist>(stp_vars_t *v, double limit)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_ink_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>f6423b74581fbf34918a9e45d22186b5</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_cutoff_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>4a04bbe68bd5c97d4b83cb1c1a147b48</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel, double adjustment)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_cutoff_adjustment</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>c868578c0a82a76d20160b23a9c9d603</anchor>
       <arglist>(stp_vars_t *v, int color, int subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_black_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>6d315737ed90af4b0b9bff8c907381c3</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_channel_get_black_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>00bbe8c93cbe8da9f431824dbb1dadcd</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_gloss_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>38a09aeef9c53c039fa7d1124921a7c9</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_channel_get_gloss_channel</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>a907ffda300039a00ae7ddb333038480</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_gloss_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>4349853a306208c7d98074a585991ef0</anchor>
       <arglist>(stp_vars_t *v, double limit)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_channel_get_gloss_limit</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>e1702ed4a233cadce00e9bc87fd5ca45</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>42d1438e758951e81ff49fbf81e73d2b</anchor>
       <arglist>(stp_vars_t *v, int channel, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_channel_get_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>619228b113312c73cdce75b15bb88313</anchor>
       <arglist>(stp_vars_t *v, int channel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_set_gcr_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>2ce95b47a5f1a6c146588e0fb49db2e4</anchor>
       <arglist>(stp_vars_t *v, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_channel_get_gcr_curve</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>0f1e6073d53036f6771a0cc69cf9e261</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_initialize</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>00b63c73990babb75e5896ffd7022634</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int input_channel_count)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_channel_convert</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>cef9de964c7569983e1ff1d0550d3bd6</anchor>
       <arglist>(const stp_vars_t *v, unsigned *zero_mask)</arglist>
     </member>
     <member kind="function">
       <type>unsigned short *</type>
       <name>stp_channel_get_input</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>f5ef85fbc689b2f94c0be23c0b8b3765</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>unsigned short *</type>
       <name>stp_channel_get_output</name>
       <anchorfile>channel_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>9c4df56f4ad83b6232cf6ec17b6dc031</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>color.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>color_8h</filename>
     <class kind="struct">stp_colorfuncs_t</class>
     <class kind="struct">stp_color</class>
@@ -327,97 +327,97 @@
       <type>stp_color</type>
       <name>stp_color_t</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gb711e2534c69bde47be7af3409c8ee2c</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g835bd7024477347a46ea0c14b46996c6</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_get_row</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gadf861820b3956ef7b18600dbf5da9da</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_color_list_parameters</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>ge2e397268288111eaffd352cb0ff1b98</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_color_describe_parameter</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gc47fecc2c32115494ea364e53d9f1ff2</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_register</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>ge3543409e331c5d1756c2c8fe927343b</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_unregister</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g3e0f2728d47e1701c00b06199bc5512d</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_count</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>ga8b8b19da7bcc9bc814fe0f97f39b3ed</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g25d9ee3ceee6d6e9964007ad12f9900b</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_index</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>ga5ddc4c9d02576154d0b2c6c64a6a033</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_colorfuncs</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>ga92373d7aa315ab6e32a1bb0ac944b79</anchor>
       <arglist>(stp_colorfuncs_t *colorfuncs)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g36d2d72d2cd967405a978b76a7a8c992</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_long_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>ga0559d7812bdcbebe4edc14fc05274d9</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>curve-cache.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>curve-cache_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <class kind="struct">stp_cached_curve_t</class>
@@ -425,97 +425,97 @@
       <type>#define</type>
       <name>CURVE_CACHE_FAST_USHORT</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>c0763605d9b80d9889407dd340e357fd</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>CURVE_CACHE_FAST_DOUBLE</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>b434b6a3a8ce63d95d11b2bce6360536</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>CURVE_CACHE_FAST_COUNT</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>b8c3f0a2734a4bdb08989cc62761e8e7</anchor>
       <arglist>(cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_free_curve_cache</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>3cef707d88b48136a52f733f80ae52dd</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_curve_data</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>5cb281dd07eecda913b168451b2d615b</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_cache_get_curve</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>256ae4356b6205ba61fbc6b5e90c1762</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_curve_invalidate</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>7966337362f5e8fc0ed54edd8da645a2</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_set_curve</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>f775dcfafb717b24ff655cc801c14dfc</anchor>
       <arglist>(stp_cached_curve_t *cache, stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_set_curve_copy</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>33011bde2e051e0b222177b0db746da9</anchor>
       <arglist>(stp_cached_curve_t *cache, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
-      <type>const size_t</type>
+      <type>size_t</type>
       <name>stp_curve_cache_get_count</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>723301540e82db80f8ce9100ec832876</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_curve_cache_get_ushort_data</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>6a318767b044ac996ae318771f715a01</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>const double *</type>
       <name>stp_curve_cache_get_double_data</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>83788e3f9d421bdab139d92127a7e5e3</anchor>
       <arglist>(stp_cached_curve_t *cache)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_cache_copy</name>
       <anchorfile>curve-cache_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>6a8addcc359b8cfbc2fa5c8cec97643d</anchor>
       <arglist>(stp_cached_curve_t *dest, const stp_cached_curve_t *src)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>curve.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>curve_8h</filename>
     <includes id="sequence_8h" name="sequence.h" local="no" imported="no">gutenprint/sequence.h</includes>
     <class kind="struct">stp_curve_point_t</class>
@@ -523,405 +523,405 @@
       <type>stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gd5ce135b7af2c6e79bae493c7055461d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
-      <anchor>ga47</anchor>
+      <anchor>g7ced905b29f0d85de94258dceb01c3f4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
-      <anchor>gga47a1</anchor>
+      <anchor>gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
-      <anchor>gga47a2</anchor>
+      <anchor>gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
-      <anchor>ga48</anchor>
+      <anchor>g1880ff988f772337e8892e791951337b</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
-      <anchor>gga48a3</anchor>
+      <anchor>gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
-      <anchor>gga48a4</anchor>
+      <anchor>gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
-      <anchor>ga49</anchor>
+      <anchor>gb7d718baf4619b6be6c4aff8ce84aad9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
-      <anchor>gga49a5</anchor>
+      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
-      <anchor>gga49a6</anchor>
+      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
-      <anchor>gga49a7</anchor>
+      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
-      <anchor>ga50</anchor>
+      <anchor>gd2b61113497bb142943d5131df3286ae</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
-      <anchor>gga50a8</anchor>
+      <anchor>ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
-      <anchor>gga50a9</anchor>
+      <anchor>ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
-      <anchor>gga50a10</anchor>
+      <anchor>ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gf6b71d25c497e99ab2c073108b080ab6</anchor>
       <arglist>(stp_curve_wrap_mode_t wrap)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>ge76787e84f2fc3ba299de94f4ecc6d82</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gfdafb0a802f00063b00713dbd6d6bfc0</anchor>
       <arglist>(stp_curve_t *dest, const stp_curve_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_destroy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g01bf94ed6a523f28dd909be054a69790</anchor>
       <arglist>(stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g5283a18fcc5db8e9f9384d54de50ba83</anchor>
       <arglist>(stp_curve_t *curve, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g4d32e3000dd3a8f258b2eab94797731b</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_wrap_mode_t</type>
       <name>stp_curve_get_wrap</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gd2aade6a22b516006ce0f897c5027f35</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_is_piecewise</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>gdda4313c874170e0086d2000ed04c02f</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_range</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gaf8bad025ea7463067c9d7ab205af062</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_curve_count_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g48d9023f28ae2d15975002f7a9d7f94e</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g3175711d943e95fdf363d5124237a56e</anchor>
       <arglist>(stp_curve_t *curve, stp_curve_type_t itype)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_type_t</type>
       <name>stp_curve_get_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gca245aa6907c2fb95e150ce9a86ddb1a</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gba540befdbd82e705358b2175d5b92e8</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gcbd01a2662edb48af0816930b40dc8ab</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>gc0401bfefa3990ca26a0fb7718f1ebb2</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gaf770dcae26ce48d5ee50dd8217e2c14</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g184e0e32892aae4b2c195c6fc880bace</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gbc9ae004e972c7d638336714f3112f9b</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g8a215d4981a74fb2b6e4a0c381314df0</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>gd23dcc9abefca9a98b3ecd9714227093</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g4051de3e6be42f4499de78af67288616</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_get_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gd4cfbfbfe0c16b8f2ef4d8c44d221172</anchor>
       <arglist>(const stp_curve_t *curve, size_t start, size_t count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g0ba6753a8beeaca19719d047da25ecb5</anchor>
       <arglist>(stp_curve_t *curve, const stp_curve_t *range, size_t start)</arglist>
     </member>
     <member kind="function">
       <type>const double *</type>
       <name>stp_curve_get_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g24b9486c45d68983e94dcc0fb19edacd</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_point_t *</type>
       <name>stp_curve_get_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>gd30e41654f1e0217aae3389b30cdffba</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_curve_get_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>gf363a0f9686bcd6521671d531bc522d5</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_curve_get_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g187af251d5a89853545c8be898a00cc1</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_curve_get_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g3ecbc0ce98e7bd7695002306f5a2ba1b</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_curve_get_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g01bda0b947a6075d4a1ed373865744e6</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_curve_get_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>gb874365285383f3eb35c1a32496a69b4</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_curve_get_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g60767bb2143fe4d491d351a4c0abc3b1</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_curve_get_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>gb2312169172ec9789af9fd38279b3273</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_curve_get_sequence</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>gee3cc69ab758b400838014df4742c28e</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g6548b7ca6ef6ab94fe1d927c246e7baf</anchor>
       <arglist>(stp_curve_t *curve, double f_gamma)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_curve_get_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>gc9786b35c2b1a55d54b62bcc57481c82</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g9a05eae4f274f420418539cceb627556</anchor>
       <arglist>(stp_curve_t *curve, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_get_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>gf9ff6f55ec0a0615608dc1baec6aff00</anchor>
       <arglist>(const stp_curve_t *curve, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_interpolate_value</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g0fdfc2b27a8a464584589ef38a8e05c4</anchor>
       <arglist>(const stp_curve_t *curve, double where, double *result)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_resample</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>gf68cf2508ff4a14a0dbee6fc0001667e</anchor>
       <arglist>(stp_curve_t *curve, size_t points)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_rescale</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gd440d8d448173adc2be6737963a6e999</anchor>
       <arglist>(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_write</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g6ef71ce7d92e659b1c902df29b1dcbc7</anchor>
       <arglist>(FILE *file, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_curve_write_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>g21aa4497c58ebbb703dc3549560f084d</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_stream</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g650e49e1250dab5d9221ad747a627fc0</anchor>
       <arglist>(FILE *fp)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_file</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>g6ff03fcc2a47f297c48b683884e81924</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g60dce8c741a9b6fde73ced2134305298</anchor>
       <arglist>(const char *string)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_compose</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g657e0ad5b93f090220d35be615fec5e4</anchor>
       <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>dither.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>dither_8h</filename>
     <class kind="struct">stp_dither_matrix_short</class>
     <class kind="struct">stp_dither_matrix_normal</class>
@@ -933,408 +933,408 @@
       <type>#define</type>
       <name>STP_ECOLOR_K</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>4faa7aec0dc7471ed5a7d1622991ac77</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_C</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>575ca9b45d518b92177323e70295198a</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_M</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>c7f1f45ff56dfbaff0a36599c6bf822c</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_ECOLOR_Y</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>e1492502d48a830e5dda11f1d7afb494</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_NCOLORS</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>3e02bef38f178e66a4439df6ec61c503</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dither_matrix_short</type>
       <name>stp_dither_matrix_short_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>373f2efaf250ca412b5447b8bd4e7f51</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dither_matrix_normal</type>
       <name>stp_dither_matrix_normal_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>a7bbfbb8dd05a8c05a5c37143adc129a</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dither_matrix_generic</type>
       <name>stp_dither_matrix_generic_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>c81f99c36dbc48c619831897bac28224</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>dither_matrix_impl</type>
       <name>stp_dither_matrix_impl_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>613c628e788dbef089fa32243500cd54</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_dotsize</type>
       <name>stp_dotsize_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>0a4617ed6063c68c6c8675fb9e8e9d01</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_shade</type>
       <name>stp_shade_t</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>737b4edb8992127d0616e78f6c0a4c14</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_iterated_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>e79d2866600d79be412b660f036995f4</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_shear</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>1c29e4d285f27f7fd300643f7023f305</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>8346fdae0bfb7422f52c0a2eec3abd87</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_init_short</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>6a7a7142c53dd1cd70b3f7fb481e5564</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_dither_matrix_validate_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>05677f96e6de536ecf91a65ee0715998</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_init_from_dither_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>a9efd9cefabdab92a8ce5fbf7aca8876</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_destroy</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>361cf36b4875e8ef2c8152f66d4a9284</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_clone</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>aaa6d937beb5f9bef6e7ec34fc776d54</anchor>
       <arglist>(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_copy</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>289ae89081129060bf67371d7ce9fcef</anchor>
       <arglist>(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_scale_exponentially</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>0d1f33cd934e13ed0b0f859d131efbc1</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, double exponent)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_matrix_set_row</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>c329929a25c54355a7ed23f23616ced5</anchor>
       <arglist>(stp_dither_matrix_impl_t *mat, int y)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_find_standard_dither_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>ef8ca9aa08ab848746e370100a4b20e2</anchor>
       <arglist>(int x_aspect, int y_aspect)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_dither_list_parameters</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>9ad687cfc22956dd88495ae0a831c1b6</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_describe_parameter</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a24</anchor>
+      <anchor>6daf654828bc5235bc785fceb8aebb89</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_init</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>6d409bf6395231621a725a45fac8bb8e</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_iterated_matrix</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a26</anchor>
+      <anchor>85eb5568b8a8036271e50794519c08e2</anchor>
       <arglist>(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_matrix</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a27</anchor>
+      <anchor>25b3d76810fd0dcb0928edff37060409</anchor>
       <arglist>(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_matrix_from_dither_array</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a28</anchor>
+      <anchor>ae5be944ec353d075ea17c32370270bd</anchor>
       <arglist>(stp_vars_t *v, const stp_array_t *array, int transpose)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_transition</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a29</anchor>
+      <anchor>d7cd0b4e7bf474516b14d0a186b23b96</anchor>
       <arglist>(stp_vars_t *v, double)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_randomizer</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a30</anchor>
+      <anchor>6d8fc8a344a764f92ee43ff8b959aace</anchor>
       <arglist>(stp_vars_t *v, int color, double)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_ink_spread</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a31</anchor>
+      <anchor>744fa9a5d204da486f07a8f1b21c9ba3</anchor>
       <arglist>(stp_vars_t *v, int spread)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_adaptive_limit</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a32</anchor>
+      <anchor>d261306c74a8affdf11ad2cc519e8bba</anchor>
       <arglist>(stp_vars_t *v, double limit)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_dither_get_first_position</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a33</anchor>
+      <anchor>f113ac1043230813204db189e3fd84a8</anchor>
       <arglist>(stp_vars_t *v, int color, int subchan)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_dither_get_last_position</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a34</anchor>
+      <anchor>e13f1c62835c48c5fb58b45c8ed35f32</anchor>
       <arglist>(stp_vars_t *v, int color, int subchan)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_inks_simple</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a35</anchor>
+      <anchor>ffc1834e675956e79ae5a866895db39c</anchor>
       <arglist>(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_inks_full</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a36</anchor>
+      <anchor>0aae5a947e8953323b097fbb79c93c68</anchor>
       <arglist>(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_set_inks</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a37</anchor>
+      <anchor>fd1d75ef5cfb0e013601a4e084352786</anchor>
       <arglist>(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_add_channel</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a38</anchor>
+      <anchor>28bb47c7e1436e2c4af3b0be87b5d1c6</anchor>
       <arglist>(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)</arglist>
     </member>
     <member kind="function">
       <type>unsigned char *</type>
       <name>stp_dither_get_channel</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a39</anchor>
+      <anchor>94da054fb7a3f42cf4c2937f4d37e528</anchor>
       <arglist>(stp_vars_t *v, unsigned channel, unsigned subchannel)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a40</anchor>
+      <anchor>a22b0e4fe00acaf11ce611e29f1b1ba3</anchor>
       <arglist>(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dither_internal</name>
       <anchorfile>dither_8h.html</anchorfile>
-      <anchor>a41</anchor>
+      <anchor>e1fe7fb65133dd6ffc227e6fcdd18fdd</anchor>
       <arglist>(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-intl-internal.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>gutenprint-intl-internal_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-intl.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>gutenprint-intl_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-module.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>gutenprint-module_8h</filename>
     <includes id="gutenprint_8h" name="gutenprint.h" local="no" imported="no">gutenprint/gutenprint.h</includes>
     <includes id="bit-ops_8h" name="bit-ops.h" local="no" imported="no">gutenprint/bit-ops.h</includes>
@@ -1350,116 +1350,116 @@
       <type>#define</type>
       <name>STP_MODULE</name>
       <anchorfile>gutenprint-module_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>47eb7c01a3f89d34af8ea0b2c9ca32a1</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint-version.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>gutenprint-version_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>STP_MAJOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g98b05dcc61492d413bb01421995f1421</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MINOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g26319655da45e42c3b498ae7db0bf62c</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MICRO_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g02b38fef35caed8b676941e8dd8aadae</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CURRENT_INTERFACE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g08cdc7e05ec4d52b2458470b6d0047fb</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_BINARY_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ge754fd2fde377ba0bbe61aee1a31dd9a</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_INTERFACE_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gfd63347e8d3a71fa8384db59deabbde5</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHECK_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g26c662a55c391d11663052ca39458972</anchor>
       <arglist>(major, minor, micro)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_check_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g888f2f6268a658d1a6b71b5288299488</anchor>
       <arglist>(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_major_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g19a4efe48689fb8f859d04e60bfe028f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_minor_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g66def32167cee385762282e36b60d3b7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_micro_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g24960731fb86305c31f0be5621ccb993</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_current_interface</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g78c76c5831f5046eee8a56bd010b24dc</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_binary_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g97878c63aacb7d1fa8eed6cf1168c2e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_interface_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gf242f39e07a0ab2f2e25e1b7bc3e3aac</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprint.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>gutenprint_8h</filename>
     <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
@@ -1474,320 +1474,320 @@
   </compound>
   <compound kind="file">
     <name>image.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>image_8h</filename>
     <class kind="struct">stp_image</class>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gf71d7111a7215d4c1f1ef1317f9d6cfc</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_image</type>
       <name>stp_image_t</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gc5b6b70cd39959ffd06deab3724d87e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
-      <anchor>ga17</anchor>
+      <anchor>g3378dd231cc63da06de0bb41f1cde78f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
-      <anchor>gga17a2</anchor>
+      <anchor>gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
-      <anchor>gga17a8</anchor>
+      <anchor>gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_init</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g74c2417d571861506be7209421a3b418</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_reset</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g69cd20ccb54500d0ee8cf38969db69a6</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_width</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g9ee4915d4a1007f2d9c730ddc96d931b</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_height</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g48a99a9a8493b75687ad0900664ca4cb</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>stp_image_status_t</type>
       <name>stp_image_get_row</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gfc93a7a3f6629f6826bf1f6f757f464e</anchor>
       <arglist>(stp_image_t *image, unsigned char *data, size_t limit, int row)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_image_get_appname</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gd36123431e93e049d813894aa039c25c</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_conclude</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>gd1017f2f9b91d7add73c2393d96f700a</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>list.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>list_8h</filename>
     <member kind="typedef">
       <type>stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g71c64aeca8ca0613215306f088b6a963</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g01be7c3ea8c46226978010d453016f22</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_node_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g3744d9043311d0bcbb21f80e79b9afba</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void *(*</type>
       <name>stp_node_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g589c7c30b003d694b844834a41a6b1fa</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>const char *(*</type>
       <name>stp_node_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g1c6584d7cf0cda45dce5d95249af6470</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>int(*</type>
       <name>stp_node_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd7ac92a42bf2184103e0a83147d1835f</anchor>
       <arglist>)(const void *, const void *)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_node_free_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gb357e17f729e41b4f96d6aada1be26b9</anchor>
       <arglist>(void *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gaf10e4bb8ce6a8b6f5f015475400eb1b</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_copy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g3bd2f5a42d3313287017bfe20859c2d9</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g1382e926901b5efa2356176826a96a1a</anchor>
       <arglist>(stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_start</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>ga67c8173f8c7b2c40e3d6dde6578faec</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_end</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g2ef0298e970fdb93955860e7ee3f878c</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_index</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g9885458dd0f6e6fe5c88c4b2b0643e2a</anchor>
       <arglist>(const stp_list_t *list, int idx)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g0fd0ea2439ab2b0c9b9fb97f14c9a470</anchor>
       <arglist>(const stp_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_long_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gdbf12ab6f47d68f2605f211023c4f520</anchor>
       <arglist>(const stp_list_t *list, const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_get_length</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g013ca40ec7e5714fc5ee5f31ac5582bc</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gc103cb4ff8870b3a8d90b6ebcade2498</anchor>
       <arglist>(stp_list_t *list, stp_node_freefunc freefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_freefunc</type>
       <name>stp_list_get_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g9d344e3c6874e6033f8fc71370678bcf</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gec59dd3b87efc811ef2b6303102ed279</anchor>
       <arglist>(stp_list_t *list, stp_node_copyfunc copyfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_copyfunc</type>
       <name>stp_list_get_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g310dd79907494b07d9005fbf50b9eb0c</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g97d7c6d659aa7d05bc54a349a07e10c0</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g468cc0a5dfb1bfbef9eebd8d4f644492</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g42bdba5fcb861bdf8facb9135039d9b8</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc long_namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>ga95d8ace9b6ec71388007024c51865cb</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gbad08ce8ef257dae054ea3816ae88fe7</anchor>
       <arglist>(stp_list_t *list, stp_node_sortfunc sortfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_sortfunc</type>
       <name>stp_list_get_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>ga759fd3cb97b9f651424b8a8fb6bedaa</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g50f49648801707436012cd5dc66b1f8c</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *next, const void *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>gde2acf279e8ea067fdc1f3f951d0b373</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_prev</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>gcee23493eafdfcfce51e2ccf29ebbf54</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_next</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>gea9c1b6daae518ebecd2981289c555f3</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_list_item_get_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g5b7d8ffea5a806953a43aee961a60fe4</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_set_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g1b5d2889a81d712c3ba024e53bfd0f38</anchor>
       <arglist>(stp_list_item_t *item, void *data)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>module.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>module_8h</filename>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <class kind="struct">stp_module_version</class>
@@ -1796,92 +1796,92 @@
       <type>stp_module_version</type>
       <name>stp_module_version_t</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>a6058b6828d19e60a3e6c86b242da863</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_module</type>
       <name>stp_module_t</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>1bc0723b8b43547b333980913ea42965</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_module_class_t</name>
-      <anchor>a13</anchor>
+      <anchor>df2656b9a248237bdf28247c133a046d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_INVALID</name>
-      <anchor>a13a2</anchor>
+      <anchor>df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_MISC</name>
-      <anchor>a13a3</anchor>
+      <anchor>df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_FAMILY</name>
-      <anchor>a13a4</anchor>
+      <anchor>df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_COLOR</name>
-      <anchor>a13a5</anchor>
+      <anchor>df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MODULE_CLASS_DITHER</name>
-      <anchor>a13a6</anchor>
+      <anchor>df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_load</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>b07deb48be35f70644fcc6013b4debd9</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_exit</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>a5bfe6fda569e476ad52024d31eca3c4</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_open</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>401000da13e2a7aacab2738838bf1fb2</anchor>
       <arglist>(const char *modulename)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_init</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>8d52ac8df2ff7c4a28900fbb598c4848</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_module_close</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>8e114f6e561ea2a5c4186b31eea363ad</anchor>
       <arglist>(stp_list_item_t *module)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_module_get_class</name>
       <anchorfile>module_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>60ee652d3ddc0bf99abc8155b4e35a01</anchor>
       <arglist>(stp_module_class_t class)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>mxml.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>mxml_8h</filename>
     <class kind="struct">stp_mxml_attr_s</class>
     <class kind="struct">stp_mxml_value_s</class>
@@ -1892,388 +1892,388 @@
       <type>#define</type>
       <name>STP_MXML_WRAP</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>76508c60800b84b90acf4e0f8e04288e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_TAB</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>24760270636887d4dbbccca15164f4eb</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_CALLBACK</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>70032c4eda848436305b71f40cf913f7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_PARENT</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>934b8d5744f37ba24d529a86f6e5f2e7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_DESCEND</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>2ed08f4813ad57773f412970856517f5</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_NO_DESCEND</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>42831d4e1a69e57461d655f610bb995a</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_DESCEND_FIRST</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>2692b08783d224aa4f726b13c4a7da68</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_BEFORE_OPEN</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>85b05ecef2dd56e2d66b0c3057705a9b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_AFTER_OPEN</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>312f2553f5c5e2f974ca8f238064dadd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_BEFORE_CLOSE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>5ef0809e92527718236cf91e591f1276</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_WS_AFTER_CLOSE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>1ffe9b0d18eb95e8b85da3d09b195aee</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_BEFORE</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>7ac1110fe031c1c8274171dda7c65ee8</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_AFTER</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>aef62f3dd5005be25edf46856ffd0e67</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MXML_ADD_TO_PARENT</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>7183b4ceb133647a5b559de1549356d1</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>enum stp_mxml_type_e</type>
       <name>stp_mxml_type_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>1ed6fadf477121e16a83bc1899c30d5c</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_attr_s</type>
       <name>stp_mxml_attr_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>1ed814dbc1628ca237bed68e27043438</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_value_s</type>
       <name>stp_mxml_element_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>504a90f35ed408a7f80f6dbdadf45ae4</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_text_s</type>
       <name>stp_mxml_text_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>a2b9c7f1c79258abe63be05529b2a908</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_value_u</type>
       <name>stp_mxml_value_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>d162e4b65493580e8bee75ef0c8c12b6</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_mxml_node_s</type>
       <name>stp_mxml_node_t</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>1d1a605dff310b7538b297c8e63b1d88</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_mxml_type_e</name>
-      <anchor>a43</anchor>
+      <anchor>dc40006361fa674950bded00ecfe2af1</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_ELEMENT</name>
-      <anchor>a43a20</anchor>
+      <anchor>dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_INTEGER</name>
-      <anchor>a43a21</anchor>
+      <anchor>dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_OPAQUE</name>
-      <anchor>a43a22</anchor>
+      <anchor>dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_REAL</name>
-      <anchor>a43a23</anchor>
+      <anchor>dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_MXML_TEXT</name>
-      <anchor>a43a24</anchor>
+      <anchor>dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlAdd</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>f5b1214c9e580debaf0350f31d03467d</anchor>
       <arglist>(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlDelete</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a26</anchor>
+      <anchor>cbdf0579701e7776af87fbb3c2bf9469</anchor>
       <arglist>(stp_mxml_node_t *node)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_mxmlElementGetAttr</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a27</anchor>
+      <anchor>23f0ed075c389d9681fb5ed3c2ecddb9</anchor>
       <arglist>(stp_mxml_node_t *node, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlElementSetAttr</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a28</anchor>
+      <anchor>eae678d773da3b4075f1feea1b14eb84</anchor>
       <arglist>(stp_mxml_node_t *node, const char *name, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlFindElement</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a29</anchor>
+      <anchor>7c0efd099878ce90b220bf4c51324cce</anchor>
       <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlLoadFile</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a30</anchor>
+      <anchor>db392c4e623e72d2b1985058564abf5d</anchor>
       <arglist>(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlLoadString</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a31</anchor>
+      <anchor>9e275680a5730ef159757b20e041723d</anchor>
       <arglist>(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewElement</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a32</anchor>
+      <anchor>305b60c2a9554ac30bb195e42cc82e75</anchor>
       <arglist>(stp_mxml_node_t *parent, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewInteger</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a33</anchor>
+      <anchor>e65d5658c5271a9e26c5a21bc0cc2f20</anchor>
       <arglist>(stp_mxml_node_t *parent, int integer)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewOpaque</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a34</anchor>
+      <anchor>533ea6ec53f37f8bdd2d89d667b0d10a</anchor>
       <arglist>(stp_mxml_node_t *parent, const char *opaque)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewReal</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a35</anchor>
+      <anchor>7754bd0d9af2be6edaeac7edf9c89c93</anchor>
       <arglist>(stp_mxml_node_t *parent, double real)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlNewText</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a36</anchor>
+      <anchor>41566f9adbe5fe307a4643e073e3d914</anchor>
       <arglist>(stp_mxml_node_t *parent, int whitespace, const char *string)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_mxmlRemove</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a37</anchor>
+      <anchor>6abe55831d77332db6b94b6cc0caaf02</anchor>
       <arglist>(stp_mxml_node_t *node)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_mxmlSaveAllocString</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a38</anchor>
+      <anchor>e3723cad1353a2142fc1abaee599380c</anchor>
       <arglist>(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_mxmlSaveFile</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a39</anchor>
+      <anchor>bfabbd9dfdce248edc2f47de1faee7c3</anchor>
       <arglist>(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_mxmlSaveString</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a40</anchor>
+      <anchor>18d0fb42d5adb6b4337df82e61116050</anchor>
       <arglist>(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlWalkNext</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a41</anchor>
+      <anchor>be88dab827e68c48b822c6250731fc57</anchor>
       <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_mxmlWalkPrev</name>
       <anchorfile>mxml_8h.html</anchorfile>
-      <anchor>a42</anchor>
+      <anchor>112485e5f15808619af7dd558528323f</anchor>
       <arglist>(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>paper.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>paper_8h</filename>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
-      <anchor>ga5</anchor>
+      <anchor>gbb66a8f6ce85d70afd9fe42472b492d8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
-      <anchor>gga5a0</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
-      <anchor>gga5a1</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
-      <anchor>gga5a2</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
-      <anchor>gga5a3</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_known_papersizes</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g93eb4d6bc44914b3ea6b184e076a0853</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_name</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g9d655e3de6954ad3c5933dc736d2509a</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g0438b0e4729f37579900b591e801f8ce</anchor>
       <arglist>(int length, int width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_index</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g08bb891f58a7decfee2b073c00715993</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g2fe5d85acaa4ff8b8e4ad1ff3cccb027</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>path.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>path_8h</filename>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_path_search</name>
       <anchorfile>path_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>8591072873a5ee644a6dd22538d84c55</anchor>
       <arglist>(stp_list_t *dirlist, const char *suffix)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_path_split</name>
       <anchorfile>path_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>bc40460305f1f4f972c08a439f406449</anchor>
       <arglist>(stp_list_t *list, const char *path)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>printers.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>printers_8h</filename>
     <includes id="list_8h" name="list.h" local="no" imported="no">gutenprint/list.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
@@ -2283,479 +2283,479 @@
       <type>stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g1a68662b730d44c11de6fb8226a309f6</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_family</type>
       <name>stp_family_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g5c0458c3c1d19474e0245c47dac29e70</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gc0a8108170f5c86621de14296fd94b1e</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_index</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g1286559c60d239563f9f15fdd27996e0</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gc041944e528afcb9a795eb6ece3fc6ff</anchor>
       <arglist>(const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g947fa230e08f9c854ca2608e76bd0d58</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gcb4cdcada01ff29c5fd4ffeaa576db9e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_printer_index_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g6f32b0213b580bf081fc8752a3eb04a1</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g00182878bdc39935e6382d7e41d55294</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g6c6c426f86307660079277ab6e90ae3d</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_family</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g9c98ccc58b2c6f9ed6bd1025220ff77d</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_manufacturer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gfc0382fd32b49ea9d171e4ce8b750c62</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_get_model</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g7ba104f0ea5ce4a88175486894010b71</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_printer_get_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>ge67398e65540b835f5c5d073c5ea0ec1</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gc3d8cdb65382cb13ea6b01072e6240d5</anchor>
       <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_print</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g121125e6646c6f6d8965f1857450749e</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_start_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g9cf59fba866430dd47508bac6561ef67</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_end_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g40637834f08a166992325af09f6a6030</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_model_id</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gc09e99e20c8a19a13a5fb6356742a92a</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify_printer_params</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>gd91f8e7a622725f0d47196cf912ddd8d</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_register</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g82b22438444849bdedb4cfbe22f209e8</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_unregister</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>ga2ab30a5e5442b7a552fc3b884e1511b</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gc9aba62164667822fd9f110740bab570</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_printer_list_parameters</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g666486047edfe4405d003b5c3bbe4b49</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_printer_describe_parameter</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g806f00d4167762c7a3d467ec37c8430e</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_describe_output</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g950e2cd193926440ba250dbc184d8588</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>sequence.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>sequence_8h</filename>
     <member kind="typedef">
       <type>stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gb3d4cae653c4303a6e5d26b516694c92</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g771327bed5a71d8d33cc6b3ec5cbdbee</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_destroy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g98c9c2859d2ebe9b1987d26b62bd6ce0</anchor>
       <arglist>(stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g5792d6f821525514199dd2d9b332ddd4</anchor>
       <arglist>(stp_sequence_t *dest, const stp_sequence_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gd37eb66db88ac93b853ba6e02b9155bc</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd56df3112937c11431e033f2d9574b96</anchor>
       <arglist>(stp_sequence_t *sequence, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g392e1da122d95d6fc07b6d73eff1d311</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_range</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gc2c70c539a3eced45be306d082faa3a6</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g166e9a610bd53cb812e328d9e111f240</anchor>
       <arglist>(stp_sequence_t *sequence, size_t size)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_sequence_get_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g99292c5ba10bcf1574c3e71a593c3e5f</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g24024e771a50db02f2713b244212603e</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_subrange</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g9b41ba7e0f1fb00cf19bbb9efe70824d</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, size_t size, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gc33208fae031bd1111f8ceb4c1425199</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gf7f49101192387e29399ded6d3166d13</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_get_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g044210129f28c298152ce124371324d4</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g34a526cb5e72b611ac8a98b559c24e2e</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gd15e2cf350bb311da58f4b11240fa0f2</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>gbc7ec322716d761436e4ad2d5d2f756f</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gd4f058b2c690ad4e326970cc841d8f79</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g40cd6256eb5bb72decd60edd1dc3be54</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>ge0d6719f863a10422dea23e7f4b4dd29</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g68aed44bbf6ede9ac49237091f2deb43</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_sequence_get_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gf8cd9da688af479103cf8600e48f61c9</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_sequence_get_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g864b55caa3a8c0e573031a36f57f7cc4</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_sequence_get_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gc4557b9fba98a7fbb4e17cc18fb0dded</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_sequence_get_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g4396baf0d338eec6f3bce3e2000da978</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_sequence_get_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g204f77e91c9283dc6ec6e742687bb0db</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_sequence_get_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g91a68efd6b99150739c7706f65703a2f</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_sequence_get_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g8bf46faeea891ac7ca699591df596bc1</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>string-list.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>string-list_8h</filename>
     <class kind="struct">stp_param_string_t</class>
     <member kind="typedef">
       <type>stp_string_list</type>
       <name>stp_string_list_t</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>6ec7eafa9cb77e5c4c2502e19f1a3f5b</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_string_list_t *</type>
       <name>stp_string_list_create</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>65077aa7201209fcaa58553d904fbc34</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_destroy</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>35638794468f0bb0dd7b912dac655bd5</anchor>
       <arglist>(stp_string_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_param_string_t *</type>
       <name>stp_string_list_param</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>997c38e27e8ad480118b84a6fdca4d79</anchor>
       <arglist>(const stp_string_list_t *list, size_t element)</arglist>
     </member>
     <member kind="function">
       <type>stp_param_string_t *</type>
       <name>stp_string_list_find</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>25fd88ec425121519cc25d5279d29e6f</anchor>
       <arglist>(const stp_string_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_string_list_count</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>023eaab359b2f3c22d1a4fa7013e01ef</anchor>
       <arglist>(const stp_string_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_string_list_t *</type>
       <name>stp_string_list_create_copy</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>e2f7a65ea28e02e39cc223898137127b</anchor>
       <arglist>(const stp_string_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_add_string</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>b9e6a3a7944ca10102b1a30a3acc6767</anchor>
       <arglist>(stp_string_list_t *list, const char *name, const char *text)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_string_list_remove_string</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>26d7d318ddcbe976df1c91134d1ab262</anchor>
       <arglist>(stp_string_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_string_list_t *</type>
       <name>stp_string_list_create_from_params</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>a4938d0cb58828f5d27086ae9c400857</anchor>
       <arglist>(const stp_param_string_t *list, size_t count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_string_list_is_present</name>
       <anchorfile>string-list_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>333d878e45062e5f3ef5cf63602f4ce3</anchor>
       <arglist>(const stp_string_list_t *list, const char *value)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>util.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>util_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
     <includes id="vars_8h" name="vars.h" local="no" imported="no">gutenprint/vars.h</includes>
@@ -2763,391 +2763,391 @@
       <type>#define</type>
       <name>STP_DBG_LUT</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>g9ef88b326f83d342849fa89c33c7e4a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_COLORFUNC</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g3560e33ba80d2a0ceb07fe51fac845be</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_INK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g328a4b66d0767134649ce30b243931c9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g8d8211f97675b37f18bff822757d04b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PCL</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>g30a9efd31b78debefd550d0b337ec795</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ESCP2</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g158e1ea4acff071440681ba678b6fb0b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CANON</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>ga0d6b1a8d780b3c5f970454678bc0323</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LEXMARK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gb8180ab505c2d7c5a717a53096ac770c</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_WEAVE_PARAMS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>gc746369f247dc346bcbdeacb1abbdbcb</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ROWS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>gb764d477ebf0db4957cc316badac70bd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MARK_FILE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g9c8f6255efb1fcf9cd3e7a68466e44ba</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LIST</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>gcb3d85de1088cf795cfeaa9e1450c4e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MODULE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g6d69d079a3d7a3e0e2b870e1e9417187</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PATH</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>gb11ef5f0ed150be2d3b999b7fc7e4f24</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PAPER</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>g08f48f3423e848f1932435c5f8e94ff7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PRINTERS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>g7bbbf3d31a1a4f6b0da808184e1c1587</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_XML</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>g51aee81a3d2a33d42417f6b61bb63f5e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_VARS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>g52844a51058ca29f975b5666743622ac</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_OLYMPUS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>g4dc6609c9bb0c256fec7361f41a5c45f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g9eaf8d50f127cd4316bf68ad34092551</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE_ERRORS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>gc80b8553e636ec01fe4e975d9f7668b9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>g44a234fbf1ab832399fc674c8cb53b1f</anchor>
       <arglist>(x)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_init</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g69354e5830712093045a4ba290a298f8</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_set_output_codeset</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gf7978ce9e414b3d8ad905ee36a51cfbd</anchor>
       <arglist>(const char *codeset)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_read_and_compose_curves</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g21168356d466d278f11dab2be8d0016e</anchor>
       <arglist>(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_abort</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g9b6b2745ee2d68d1ca356a79c50f0ed7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_prune_inactive_options</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gf64336e7c536a51d0debe88f1f5ec90a</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_zprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g18aaa3874e4dd5259a4d182fa8d9c90a</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_zfwrite</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9135d4c8cac78593aff55b668d09b79c</anchor>
       <arglist>(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_putc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gf07e31a63021b4d504cc5a410e1aeb08</anchor>
       <arglist>(int ch, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g01199dc1d5a3db973d22cc9db00a4f41</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g3c20beae37d9841e095b336d6f7dcc1d</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g0a445c531388afa31650ef4ccdac3ae1</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gbe0e31fbc0c4e6374903b25edc594f5e</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_puts</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g0a59761c8a4ee5f31cfb9bec2a9b00b4</anchor>
       <arglist>(const char *s, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_send_command</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g23ee64de1ec6ef5a4941ab80ba609840</anchor>
       <arglist>(const stp_vars_t *v, const char *command, const char *format,...)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_erputc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g859b75eddde620338859121451096097</anchor>
       <arglist>(int ch)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_eprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g47c73485971132d9b41a33bdf572f670</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_erprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g5f6389ed7d500f851cabe8425a158e4b</anchor>
       <arglist>(const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_asprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g6bdd7099220fe310b228dcff5159b8d9</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void void</type>
       <name>stp_catprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g34d3ebda7c5b75ab40d1600f4d79a4be</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_get_debug_level</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g9ab4c35dd4b6e142281ff36ecedee27e</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g24e214e32810cc67c493c270a6ad83d6</anchor>
       <arglist>(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_deprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>gf7bc1bd0ff92ca0f6ba7d0eb559e1da3</anchor>
       <arglist>(unsigned long level, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_init_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g26a43ceec27ca34bc49f4806900b4618</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_flush_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>gf39c22b74843750ca74a6caccb263c7c</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_malloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g7c76d059684ee6dc5bdc06e4b3af18ef</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_zalloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>gae1d98650ef9777ae4f4b10eae60b5c9</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_realloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g908f11aeabf31c8a9621bd65d408a5fc</anchor>
       <arglist>(void *ptr, size_t)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_free</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>gabf89ff6213b9dc568fbdd1342b663ad</anchor>
       <arglist>(void *ptr)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_strlen</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g054943d301baecba82cdb78b7e454880</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strndup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g2c6b28a35780bfa7d03a2f8381ee82c2</anchor>
       <arglist>(const char *s, int n)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strdup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g2f861f4a98ad496ca8cd995147867f32</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g77022a2cfde3a9ba9269f1bc3726175c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_release_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>ged2a65d98cba1fd6d48c0cc1b611ae0f</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>vars.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>vars_8h</filename>
     <includes id="array_8h" name="array.h" local="no" imported="no">gutenprint/array.h</includes>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprint/curve.h</includes>
@@ -3160,1100 +3160,1100 @@
       <type>stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gde33aeed00b53e4af71ee1f7c4326279</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void *</type>
       <name>stp_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gb264246d4b7e584447b5f39ed8f7ee05</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>const void *</type>
       <name>stp_const_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g73ac4d52cb5cecbb9694e9038fb7ea82</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gd11be815334025415a8e2023e0cd44c5</anchor>
       <arglist>)(void *data, const char *buffer, size_t bytes)</arglist>
     </member>
     <member kind="typedef">
       <type>void *(*</type>
       <name>stp_copy_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gd31fc080a2bd980c6a05a541dc1612a3</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_free_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g3f7233002f4db790a077e33c2661665c</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9ee295029ad2d072b4099dc390359900</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ga132</anchor>
+      <anchor>ge031ab2c7ff60007e284ed71a73111e5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gga132a7</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gga132a8</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gga132a9</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gga132a10</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gga132a11</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gga132a12</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gga132a13</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gga132a14</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gga132a15</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gga132a16</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>ga133</anchor>
+      <anchor>g13c0565b3039fa25fd77092a578d44e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gga133a17</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gga133a18</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gga133a19</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gga133a20</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>ga134</anchor>
+      <anchor>gaa13470b0a857e96dbe70882b3fb8ebe</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>gga134a21</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>gga134a22</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>gga134a23</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>gga134a24</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>gga134a25</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>gga134a26</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>gga134a27</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>gga134a28</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>gga134a29</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>ga135</anchor>
+      <anchor>gb11c7af74fa0595684377cafe4d4eb53</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>gga135a30</anchor>
+      <anchor>ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>gga135a31</anchor>
+      <anchor>ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>gga135a32</anchor>
+      <anchor>ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>ga136</anchor>
+      <anchor>g1d02c21b8f025b121dd340db9adf3516</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gga136a33</anchor>
+      <anchor>gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gga136a34</anchor>
+      <anchor>gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gga136a35</anchor>
+      <anchor>gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gae35d353b6f86b1cbb97bb0b271f5c9a</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g165ae58fed1515b5466ab1b84df85a86</anchor>
       <arglist>(stp_vars_t *dest, const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g3c6d765cc5a27b322289e9baa9d97098</anchor>
       <arglist>(const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g78259fcaa881655a07ef0b2b457bdf70</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ga8d9dbb1e613cfe2b119668158e35a76</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>ge303a6ed77135b691ebbfd56cb577531</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gcf8efdb6fd9847e41c85f9491a252f01</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g335e7eb264fa22343765146fb2318b31</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g3164aa99994dabb561d6c295eb647123</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g087136342c500c138d73dbe0e2aad11a</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g5d675ab9877df60ec467a20a0d62fcbc</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gd3fbd778898c2b0fba19d0937fb939f5</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>gaa76e04fcde3aa6c162fb9d2fcaca251</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>gcda38fc8e26a75c2b5d246b4341a8fd3</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>gdbdd8bad1742e87b5c5a299c2ebf7cf4</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g68110f6d19b3987f6f66baee3926eb89</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g7623276e130cb684670ecb153300ebaf</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g751759cdeb8feb061c00f35d37fea45c</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>gea14f3cad139fc5b8d547a252deacff3</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g775714bf75f1fdbdd895f59edc9eca55</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g94d8cf912e3b036f67bc2d4c37d733ff</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g30d5438686c8ead9a092f98bf3c3d8ca</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g095834813ebbe8985d443e1fa78a0b98</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>ge89d8eb48e4a7a8107b87a44a4318064</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>g9fe5b4efdfaa3e79918dd5079e61e2c5</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>g8fef23ae01a368f4d16ad95813d97d6d</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g54e35f94578f346c07718587f18b049c</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g7a006418c4dbb265be71f7b5a202455d</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>ge66b9c64f5821ee6e95f4b9e18cadd4e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_merge_printvars</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>gc970fc314c6418d9193d93c787b908d9</anchor>
       <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_get_parameter_list</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g955b215a88b868cfc74d7a340de9b8f6</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_parameter_list_count</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>gf69f651a798e9f06c67baf06f0754228</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>g3dea1f995d40482b9f6470fedd994f95</anchor>
       <arglist>(stp_const_parameter_list_t list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_list_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g96fc73864dfc00ae418f14a81c72be26</anchor>
       <arglist>(stp_const_parameter_list_t list, size_t item)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>gd0f6c2b153638f551d7709780eb7276a</anchor>
       <arglist>(stp_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g3c1ddd3c10c367c0912fdd841576278f</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_add_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>ga8dc4ff543dbc1882d673b25234088b6</anchor>
       <arglist>(stp_parameter_list_t list, const stp_parameter_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g62c6225b0721d5c80d889edc307f0b6b</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_append</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>gf8aa1d7aba11de5fdee95b9cb339be61</anchor>
       <arglist>(stp_parameter_list_t list, stp_const_parameter_list_t append)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>ged453c314365a3948b195e3175455a12</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_description_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>gc5a3eb0348d31acf60772265c3896542</anchor>
       <arglist>(stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find_in_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>g711cf3e5e52fd3434ef7a9d16654aea8</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>g22338d64a871a8b279fdee6fd83fff7f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>g5182246d4e0653f73dfaa40b62d4285f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g8134e4dc36b063a7d7dd229b9df32726</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>g6e6c5474c253a452073eba25251a1481</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>g82f7bbcf639c60678c1dc2aee24e8a24</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga55</anchor>
+      <anchor>g8c6cd5f3bb3ab59a4f06c020c062c13e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga56</anchor>
+      <anchor>g778b0e43aad1e011012b8071b469c694</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga57</anchor>
+      <anchor>g8f67ed7dcee969e77374fb4daf468d58</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga58</anchor>
+      <anchor>g5f4adaadb80cd2d94569881d96cfa02e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga59</anchor>
+      <anchor>g1f63514f8ffd8ea56f0beee69398ee01</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga60</anchor>
+      <anchor>gd40038a74fa7548da5fcaec6687c8787</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_scale_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga61</anchor>
+      <anchor>gec605c647cab13d61ab5e2822d9f7ead</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double scale)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga62</anchor>
+      <anchor>g71306c3e3118d9a4545b0a3cefb863ea</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga63</anchor>
+      <anchor>g65b18994af3384af04e2bf77e288f54f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga64</anchor>
+      <anchor>gae28e4c640fba005a72e92af66327b50</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga65</anchor>
+      <anchor>gdeae102d1bd65147221f56e6095f35ef</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga66</anchor>
+      <anchor>g59b79c779211a72de534fb9e61548f97</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga67</anchor>
+      <anchor>gbf1d9c938d364598414e9f15c41c1f08</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga68</anchor>
+      <anchor>g18b8a4fb414245d2c30df9ee11057845</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga69</anchor>
+      <anchor>gd286782f691998858e30a202506bad74</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga70</anchor>
+      <anchor>gdd7769bfece8597cde869eced1239a1e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga71</anchor>
+      <anchor>ga1620e4be3c7fb85262802338d3143f6</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga72</anchor>
+      <anchor>gf95184ecee86a92db2a7d3f050154a46</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga73</anchor>
+      <anchor>ga59b141facb320c409d9071f469fdbc5</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga74</anchor>
+      <anchor>g5efb45e6883a2522fd7e78c6eb761c79</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_get_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga75</anchor>
+      <anchor>g46195f69cc57bd18a4cde5756dd84601</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga76</anchor>
+      <anchor>g22bc2b8307fb6a95dac7fcf3d35bf6b9</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga77</anchor>
+      <anchor>gb4121cba599314c929d04cce0e850473</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga78</anchor>
+      <anchor>g4cc8b69619067f882035cca46e9ce0cd</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_get_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga79</anchor>
+      <anchor>g1a5a2746548465d681d00c6301a26100</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_array_t *</type>
       <name>stp_get_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga80</anchor>
+      <anchor>gb918206f9b70fff5d58a16a762295981</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_raw_t *</type>
       <name>stp_get_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga81</anchor>
+      <anchor>g9f4db93fc31ad52018bc3ad14b58bfc2</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga82</anchor>
+      <anchor>gc7fe8cd335309d755fe5b54bf6b8e5a3</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga83</anchor>
+      <anchor>g7acde85eb361525f5cf481bafddbc1bd</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga84</anchor>
+      <anchor>g740a5cab681f30b8cc5e4ca18197e472</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga85</anchor>
+      <anchor>g4841e9250e4c7f38f2267355402ffcc1</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga86</anchor>
+      <anchor>g28203d9250f232f9af290802cf2db881</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga87</anchor>
+      <anchor>ge5b7e3356b3c1c893620fdeeea486e48</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga88</anchor>
+      <anchor>g9e992f880bd74cd4097527a39aea7125</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga89</anchor>
+      <anchor>gb9df68cbf9973203adfca5e1293b300a</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga90</anchor>
+      <anchor>ga79b051578077beca548be224062705c</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga91</anchor>
+      <anchor>g44793f2cf64b11917b8943d20ee43b9d</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga92</anchor>
+      <anchor>g8c04ab4487623a41e0b2600d466a88ad</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga93</anchor>
+      <anchor>g38a95079fd6f90a0c6a92c5ddeb104ca</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga94</anchor>
+      <anchor>g1c724bc85737bf8c698a08bc2d441b3e</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga95</anchor>
+      <anchor>g6fa1953ee96051566a261f3391da3857</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga96</anchor>
+      <anchor>ge12a7edf773cbe04fb98b171ba2c2fb9</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga97</anchor>
+      <anchor>g160150a3a39d66f5a807d1c750a57890</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga98</anchor>
+      <anchor>gf2aada3c00f9b00bc6a65014da87e250</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga99</anchor>
+      <anchor>g9fe388535a67f8360ab21f58233c0e17</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga100</anchor>
+      <anchor>gae6b21f76f675516e9189c47444e17cf</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga101</anchor>
+      <anchor>gb411dae8fb16ec9f289d4f2f1ecabcfc</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga102</anchor>
+      <anchor>g2deea3612965e28cd0d513c5850ca074</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga103</anchor>
+      <anchor>g056b021334fe812aa14bbbfd60aafba8</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga104</anchor>
+      <anchor>gcdfa2f747081721c03b10484a832a535</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga105</anchor>
+      <anchor>gadfd66825dd58fb8e0851d493445c4e4</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga106</anchor>
+      <anchor>geecfc1f1fdc97ea165ae35b64de95178</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga107</anchor>
+      <anchor>gdf6c305c48d012bc138db025c9bd63df</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga108</anchor>
+      <anchor>g5bd30b408d6ec16b3999dce5e540a5fa</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga109</anchor>
+      <anchor>gda8dd20ab17a9b403c68b4cd86fb529c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga110</anchor>
+      <anchor>g0f09e85b570ffee4a4d94853bb22bcb3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga111</anchor>
+      <anchor>g28d01beda4b54cec395654847dbbc301</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga112</anchor>
+      <anchor>gac76d8e06c3ce3fb0f27c0c80d6ad5fc</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga113</anchor>
+      <anchor>g8125d08f90002e654f2e45427e2f0251</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga114</anchor>
+      <anchor>g361d0ba27ad2ec9e99e5eec05f2e76a6</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga115</anchor>
+      <anchor>gb686075ecbdf349387c356826b432191</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga116</anchor>
+      <anchor>g64e5f74483ffb7bd4412f4eefeb22250</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga117</anchor>
+      <anchor>g57abcfb2fa58e743f9d30f579481845a</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga118</anchor>
+      <anchor>ge690d9171bcdb0fedf981804bb923fac</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga119</anchor>
+      <anchor>gebcb03afca6bb0d94e71bdf570d09af9</anchor>
       <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_size_limit</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga120</anchor>
+      <anchor>gf2c1a37f8d837fae61bb18de1cd7bdc3</anchor>
       <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga121</anchor>
+      <anchor>g5735451225c2a355cb11c165e011637d</anchor>
       <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga122</anchor>
+      <anchor>ge28b0d78641811b1625a52971a2d11fa</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_default_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga123</anchor>
+      <anchor>g9f897908b19f5f0cdaf75b483d46e041</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga124</anchor>
+      <anchor>geb61df54d59bfebdcb77b1e5e993ebaa</anchor>
       <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_destroy_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga125</anchor>
+      <anchor>g089f9a34f26f700f43858ba3959d8f13</anchor>
       <arglist>(stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga126</anchor>
+      <anchor>g8eea0724106ea7174b808026ae8d1a5c</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_verify_t</type>
       <name>stp_verify_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga127</anchor>
+      <anchor>gf64e586fca554f2dd65157a76eaad34a</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga128</anchor>
+      <anchor>ga1b826f02f84aa038c6862575770b629</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga129</anchor>
+      <anchor>g8a2924dd6393431e994d22c704ec25fc</anchor>
       <arglist>(stp_vars_t *v, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_copy_options</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga130</anchor>
+      <anchor>gbd8b19b70d2f2fc7dcd7c896b3ed5d98</anchor>
       <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_fill_parameter_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga131</anchor>
+      <anchor>g6a08746f33133e8873236b35eb1e7a62</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>weave.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>weave_8h</filename>
     <class kind="struct">stp_weave_t</class>
     <class kind="struct">stp_pass_t</class>
@@ -4266,335 +4266,335 @@
       <type>#define</type>
       <name>STP_MAX_WEAVE</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>46ee59dd8e65c35e69ba8cfa94e90786</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>int</type>
       <name>stp_packfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>ebd02297dfdf36f818d0ff48c900f561</anchor>
       <arglist>(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</arglist>
     </member>
     <member kind="typedef">
       <type>void</type>
       <name>stp_fillfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>910269f43cbcff87ce004bb20b659d9e</anchor>
       <arglist>(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)</arglist>
     </member>
     <member kind="typedef">
       <type>void</type>
       <name>stp_flushfunc</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>76c426b3b4c3b2503c54f2c2a013768a</anchor>
       <arglist>(stp_vars_t *v, int passno, int vertical_subpass)</arglist>
     </member>
     <member kind="typedef">
       <type>int</type>
       <name>stp_compute_linewidth_func</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>520099a705f78fd503d204665ee21d5d</anchor>
       <arglist>(stp_vars_t *v, int n)</arglist>
     </member>
     <member kind="enumeration">
       <name>stp_weave_strategy_t</name>
-      <anchor>a26</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce027</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ZIGZAG</name>
-      <anchor>a26a11</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING</name>
-      <anchor>a26a12</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_DESCENDING</name>
-      <anchor>a26a13</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_2X</name>
-      <anchor>a26a14</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_STAGGERED</name>
-      <anchor>a26a15</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_WEAVE_ASCENDING_3X</name>
-      <anchor>a26a16</anchor>
+      <anchor>6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_weave</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>9b72df98be9b9e25b42aca6ef5901d35</anchor>
       <arglist>(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_flush_all</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>5b0aac599abc4859e2d208db7185cdbf</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_write_weave</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>b021ec20fafa48e57495123df1533b62</anchor>
       <arglist>(stp_vars_t *v, unsigned char *const cols[])</arglist>
     </member>
     <member kind="function">
       <type>stp_lineoff_t *</type>
       <name>stp_get_lineoffsets_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>816c57bb673bebebaa42576b3e452206</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>stp_lineactive_t *</type>
       <name>stp_get_lineactive_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>14c1a0f43a0353f7771632d3a0356cea</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>stp_linecount_t *</type>
       <name>stp_get_linecount_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>46dacaec8d953a33f6c15299f3a91046</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>const stp_linebufs_t *</type>
       <name>stp_get_linebases_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>207eac262dceb86f20fe32b048b257ad</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>stp_pass_t *</type>
       <name>stp_get_pass_by_pass</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a24</anchor>
+      <anchor>129f77403ade9f504dd38185a7ab6209</anchor>
       <arglist>(const stp_vars_t *v, int pass)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_weave_parameters_by_row</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>3dbb20fd24c73c2982819b1f184b7ee3</anchor>
       <arglist>(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)</arglist>
     </member>
     <member kind="variable">
       <type>stp_packfunc</type>
       <name>stp_pack_tiff</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>27cae2ded3a9434dd6f332dbf6721f71</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_packfunc</type>
       <name>stp_pack_uncompressed</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>b81173e35f655b1a8f0047cbadce5391</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_fillfunc</type>
       <name>stp_fill_tiff</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>6c47bead0399664b9041a6d5687b091e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_fillfunc</type>
       <name>stp_fill_uncompressed</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>fb161f053574d9cd4a47b613b614b0f3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_compute_linewidth_func</type>
       <name>stp_compute_tiff_linewidth</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>a6df061ed81c1a6ecb8854b6eab4e276</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_compute_linewidth_func</type>
       <name>stp_compute_uncompressed_linewidth</name>
       <anchorfile>weave_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>f6c7a76f229fdc0be020a53a15a4a5f5</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>xml.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
     <filename>xml_8h</filename>
     <includes id="mxml_8h" name="mxml.h" local="no" imported="no">gutenprint/mxml.h</includes>
     <member kind="typedef">
       <type>int(*</type>
       <name>stp_xml_parse_func</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>ec3dca5a8c562175532452b7a055200f</anchor>
       <arglist>)(stp_mxml_node_t *node, const char *file)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_register_xml_parser</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>3258e11973b45c04e9ec1810789cface</anchor>
       <arglist>(const char *name, stp_xml_parse_func parse_func)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unregister_xml_parser</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>bdff70654d8ca31445e0957cfad68816</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_register_xml_preload</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>0377f341fce4c764d695b851cf90125c</anchor>
       <arglist>(const char *filename)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_unregister_xml_preload</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>f9605dfeaf5ba8c41b42aba2c09b4f20</anchor>
       <arglist>(const char *filename)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_xml_init_defaults</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>9e2620e798edcd889cd80454374a0a1d</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_xml_parse_file</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>477e8c523df78a068e98be5e929d6825</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>long</type>
       <name>stp_xmlstrtol</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>56885d576d38f8fbffce10834e892117</anchor>
       <arglist>(const char *value)</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_xmlstrtoul</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>9d7f6cba6d4f5b8b01b6d3c192d10596</anchor>
       <arglist>(const char *value)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_xmlstrtod</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>666632a9a3cb7f802fd5478d68d57166</anchor>
       <arglist>(const char *textval)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_init</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>e279cdb2639cb00884563204c586e34a</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_exit</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>d35445001b4f0ff02b45cf411b056cb2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xml_get_node</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>acec0c2b6d806a70b74c2c9efb5ca895</anchor>
       <arglist>(stp_mxml_node_t *xmlroot,...)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmldoc_create_generic</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>d698808efae24e1f0002243256171fc0</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_preinit</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>e2aeb50ec9bffd4cc7ff4b8756ce503a</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create_from_xmltree</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>174add090763cd3d8a019da75257e9c5</anchor>
       <arglist>(stp_mxml_node_t *da)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_sequence</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>134d8ffe83aa1bc29ca65869af337479</anchor>
       <arglist>(const stp_sequence_t *seq)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_xmltree</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>4b39835d489b183bdf939551f7b6871b</anchor>
       <arglist>(stp_mxml_node_t *da)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_curve</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>286050c77ae8ee255a7b6035b88d5fb4</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create_from_xmltree</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>301d2355b8bb9986a7bc4f84cc6c9d40</anchor>
       <arglist>(stp_mxml_node_t *array)</arglist>
     </member>
     <member kind="function">
       <type>stp_mxml_node_t *</type>
       <name>stp_xmltree_create_from_array</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>90e7cdadf10d6492082fd008b79853b0</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_xml_parse_file_named</name>
       <anchorfile>xml_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>2ff6722b18cd21c91e60e7ef1cedc0d4</anchor>
       <arglist>(const char *name)</arglist>
     </member>
   </compound>
@@ -4605,105 +4605,105 @@
       <type>int</type>
       <name>base</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>593616de15330c0fb2d55e55410bf994</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>exp</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>b0ab0254bd58eb87eaee3172ba49fefb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>x_size</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>f0ed41c0ec21ebf3f06c1a1ec9d04456</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y_size</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>6f8a30ff8882b910eb6092965bff1166</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>total_size</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>2cd6b347ff013dd494370a9938344885</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_x</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>94f66fddf2c8dd22340220c82f6115fd</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_x_mod</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>f1cbd20a4cb7668e3b450ae3c7879fb2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_y</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>dcf093deead926d5e89cdf4cf72068cf</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>last_y_mod</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>ea9a91cee135cee3ba2750f2875cf610</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>index</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>6a992d5529f459a44fee58c733255e86</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>i_own</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>618931f210c709ac7c0a44ed090aef93</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>x_offset</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o11</anchor>
+      <anchor>80997876f6afba983eaec918e58ecc0d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y_offset</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o12</anchor>
+      <anchor>6055652d6d84e1c46e19438c923113ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>fast_mask</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o13</anchor>
+      <anchor>31acd511b5ec97637395c849e2089e00</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned *</type>
       <name>matrix</name>
       <anchorfile>structdither__matrix__impl.html</anchorfile>
-      <anchor>o14</anchor>
+      <anchor>21b72c0b7adc5c7b4a50ffcb90d92dd6</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4714,28 +4714,28 @@
       <type>stp_curve_t *</type>
       <name>curve</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const double *</type>
       <name>d_cache</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>f7e3e9aa11a7dd4199647af2e87a3bab</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned short *</type>
       <name>s_cache</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>9c9886e8af38f75727d2b354afa8f218</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>size_t</type>
       <name>count</name>
       <anchorfile>structstp__cached__curve__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>e2942a04780e223b215eb8b663cf5353</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4746,21 +4746,21 @@
       <type>const char *</type>
       <name>short_name</name>
       <anchorfile>structstp__color.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>4698bac7fdbf14511adbe13aeefe80b8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>long_name</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>2fc6351aa4209f68fb16e85c6104f96c</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_colorfuncs_t *</type>
       <name>colorfuncs</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchorfile>structstp__color.html</anchorfile>
+      <anchor>a3f019e45920da0adf4ce2eec4cc2e7c</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4771,28 +4771,28 @@
       <type>int(*</type>
       <name>init</name>
       <anchorfile>structstp__colorfuncs__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>5aafc0d83b487b1d0a8db5c1f1cd227d</anchor>
       <arglist>)(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>get_row</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>1130ff4ca5f70a5f951b69fa41ef8016</anchor>
       <arglist>)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
     </member>
     <member kind="variable">
       <type>stp_parameter_list_t(*</type>
       <name>list_parameters</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>54879ee9c7f05b72f24bab4bce932970</anchor>
       <arglist>)(const stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>describe_parameter</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchorfile>structstp__colorfuncs__t.html</anchorfile>
+      <anchor>358435dd7c4c3dba226ba7016dba0cad</anchor>
       <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
   </compound>
@@ -4803,14 +4803,14 @@
       <type>double</type>
       <name>x</name>
       <anchorfile>structstp__curve__point__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>y</name>
       <anchorfile>structstp__curve__point__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>415290769594460e2e485922904f345d</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4821,35 +4821,35 @@
       <type>int</type>
       <name>x</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>415290769594460e2e485922904f345d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const void *</type>
       <name>data</name>
       <anchorfile>structstp__dither__matrix__generic.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4860,35 +4860,35 @@
       <type>int</type>
       <name>x</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>415290769594460e2e485922904f345d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned *</type>
       <name>data</name>
       <anchorfile>structstp__dither__matrix__normal.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4899,35 +4899,35 @@
       <type>int</type>
       <name>x</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>9dd4e461268c8034f5c8564e155c67a6</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>y</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>415290769594460e2e485922904f345d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>bytes</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>prescaled</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>aa3d9d64037ca4cdd2a4d871d673bd73</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned short *</type>
       <name>data</name>
       <anchorfile>structstp__dither__matrix__short.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4938,32 +4938,32 @@
       <type>unsigned</type>
       <name>bit_pattern</name>
       <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>67b7bfbc0ce2bbedbf5837e91f8773cd</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>value</name>
       <anchorfile>structstp__dotsize.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_double_bound_t</name>
     <filename>structstp__double__bound__t.html</filename>
-    <member kind="variable">
+    <member kind="typedef">
       <type>double</type>
       <name>lower</name>
       <anchorfile>structstp__double__bound__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>81e073b428b50247daba38531dcf412a</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>double</type>
       <name>upper</name>
       <anchorfile>structstp__double__bound__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>0122b4c2c01ee1c698ecc309d2b8eb5a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4974,14 +4974,14 @@
       <type>const stp_printfuncs_t *</type>
       <name>printfuncs</name>
       <anchorfile>structstp__family.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>c0c2f50561daa16ae61c455b0861718a</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_list_t *</type>
       <name>printer_list</name>
       <anchorfile>structstp__family.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>505045dc6abce739a39cbc650ad05535</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -4992,74 +4992,74 @@
       <type>void(*</type>
       <name>init</name>
       <anchorfile>structstp__image.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>9aebe24f43e2fe0d4342495a64026baa</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>reset</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>edae63ed1524916fdef45cb652d7275e</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>width</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>85ce2739e10b7c073f108a82b3e5d717</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>height</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>36cffb4418960b12743fc547902e35a6</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>stp_image_status_t(*</type>
       <name>get_row</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>e2681945ea918b7082ba78751d084347</anchor>
       <arglist>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</arglist>
     </member>
     <member kind="variable">
       <type>const char *(*</type>
       <name>get_appname</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>e9495dba1df955709ebbd651c1a526e6</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>conclude</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>6af9f0bf8a602f4a937c6e207a03ec01</anchor>
       <arglist>)(struct stp_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>rep</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchorfile>structstp__image.html</anchorfile>
+      <anchor>75a384057459ae8e69fb9a98a249b4f4</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_int_bound_t</name>
     <filename>structstp__int__bound__t.html</filename>
-    <member kind="variable">
+    <member kind="typedef">
       <type>int</type>
       <name>lower</name>
       <anchorfile>structstp__int__bound__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>81e073b428b50247daba38531dcf412a</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>int</type>
       <name>upper</name>
       <anchorfile>structstp__int__bound__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>0122b4c2c01ee1c698ecc309d2b8eb5a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5070,14 +5070,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__lineactive__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>v</name>
       <anchorfile>structstp__lineactive__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5088,21 +5088,21 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int *</type>
       <name>start_pos</name>
       <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>8fb0bcdadf14357992c7faea15fb9497</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int *</type>
       <name>end_pos</name>
       <anchorfile>structstp__linebounds__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>1f90fb291292e9a933aa6aac4a9c857e</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5113,14 +5113,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__linebufs__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned char **</type>
       <name>v</name>
       <anchorfile>structstp__linebufs__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5131,14 +5131,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__linecount__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int *</type>
       <name>v</name>
       <anchorfile>structstp__linecount__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5149,14 +5149,14 @@
       <type>int</type>
       <name>ncolors</name>
       <anchorfile>structstp__lineoff__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>7e65a932280df4e01f60294f031fb97e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned long *</type>
       <name>v</name>
       <anchorfile>structstp__lineoff__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5167,56 +5167,56 @@
       <type>const char *</type>
       <name>name</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>version</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>2af72f100c356273d46284f6fd1dfc08</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>comment</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>06d4cd63bde972fc66a0aed41d2f5c51</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_module_class_t</type>
       <name>class</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>a2f2ed4f8ebc2cbb4c21a29dc40ab61d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>handle</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>e1260894f59eeae98c8440899de4df8d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>init</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>e410d3c31d3473619bad7812df075dd9</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>fini</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>b5296150c31e6581161fc46595a06b78</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void *</type>
       <name>syms</name>
       <anchorfile>structstp__module.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>928a1fa51ea5f2eaae90429c74743ced</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5227,14 +5227,14 @@
       <type>int</type>
       <name>major</name>
       <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>f1425da40a9f2d21ab702a1c7feae026</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>minor</name>
       <anchorfile>structstp__module__version.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>ab846c0e3717a3e7d14af45cab70b44a</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5245,14 +5245,14 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>value</name>
       <anchorfile>structstp__mxml__attr__s.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5263,49 +5263,49 @@
       <type>stp_mxml_type_t</type>
       <name>type</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>599dcce2998a6b40b1e38e8c6006cb0a</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>next</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>d0cab90d8d20d57e2f2b9be52f7dd25d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>prev</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>fcb08b164ac83e09964deb24f2d2e80b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>parent</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>d0e45878043844ffc41aac437e86b602</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>child</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>1b7d5726533ab525a8760351e9b5e415</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_node_t *</type>
       <name>last_child</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>683657fb65ef37f597bddef3847a3eff</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_value_t</type>
       <name>value</name>
       <anchorfile>structstp__mxml__node__s.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5316,14 +5316,14 @@
       <type>int</type>
       <name>whitespace</name>
       <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>67b8601a11e47a9ee3bf08ddfd0b79ba</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>string</name>
       <anchorfile>structstp__mxml__text__s.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>b45cffe084dd3d20d928bee85e7b0f21</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5334,21 +5334,21 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>num_attrs</name>
       <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>30f1579a824317cbe2b6837454cd0ef1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_attr_t *</type>
       <name>attrs</name>
       <anchorfile>structstp__mxml__value__s.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>425ce871530e0633c917f98d8e9b1bc7</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5359,35 +5359,35 @@
       <type>stp_mxml_element_t</type>
       <name>element</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>8e2dcfd7e7e24b1ca76c1193f645902b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>integer</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>157db7df530023575515d366c9b672e8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>opaque</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>94619f8a70068b2591c2eed622525b0e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>real</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>4bca24304861acde5770fdbe3cc2503b</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_mxml_text_t</type>
       <name>text</name>
       <anchorfile>unionstp__mxml__value__u.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5398,70 +5398,70 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>text</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>comment</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>06d4cd63bde972fc66a0aed41d2f5c51</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>width</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>eaae26a6fb20ed3ef54fb23bfa0b1fcc</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>height</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>b435e227d5dd201e1768b2bcb2e0aa81</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>top</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>b28354b543375bfa94dabaeda722927f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>left</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>811882fecd5c7618d7099ebbd39ea254</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>bottom</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>71f262d796bed1ab30e8a2d5a8ddee6f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>unsigned</type>
       <name>right</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>7c4f29407893c334a6cb7a87bf045c0d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_papersize_unit_t</type>
       <name>paper_unit</name>
       <anchorfile>structstp__papersize__t.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>00a9745ae8b0126b5763ba88daba837b</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5472,207 +5472,207 @@
       <type>const char *</type>
       <name>name</name>
       <anchorfile>structstp__param__string__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>text</name>
       <anchorfile>structstp__param__string__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_parameter_t</name>
     <filename>structstp__parameter__t.html</filename>
-    <member kind="variable">
+    <member kind="typedef">
       <type>const char *</type>
       <name>name</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>const char *</type>
       <name>text</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>1cb251ec0d568de6a929b520c4aed8d1</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>const char *</type>
       <name>category</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>c4ef352f74e502ef5e7bc98e6f4e493d</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>const char *</type>
       <name>help</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>657f8b8da628ef83cf69101b6817150a</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>stp_parameter_type_t</type>
       <name>p_type</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>ee532d298de9538e682d9a1eaea12378</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>stp_parameter_class_t</type>
       <name>p_class</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>8112bb5792909f9417d1f6d2ab36863a</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>stp_parameter_level_t</type>
       <name>p_level</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>c52b547d5a185fa1e792e175f90d24fc</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>unsigned char</type>
       <name>is_mandatory</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>c261f1bf67a23fb36eadbb2c644c162f</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>unsigned char</type>
       <name>is_active</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>4264c638e0098acb172519b0436db099</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>unsigned char</type>
       <name>channel</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>c485d2ed5cc4ce64fcccca710c7a0bb7</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>unsigned char</type>
       <name>verify_this_parameter</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>f07c856ac0ac425e65f87fff7a12b34d</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>unsigned char</type>
       <name>read_only</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o11</anchor>
+      <anchor>befe72871b2de8f4f0e20108517e31fe</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_parameter_t::@0</type>
       <name>bounds</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o18</anchor>
+      <anchor>eb49194cccc646fc8e93a368301834ea</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_curve_t *</type>
       <name>curve</name>
       <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_double_bound_t</type>
       <name>dbl</name>
       <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>365b8373d0bf6dc9e3450af670cc1d35</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_int_bound_t</type>
       <name>integer</name>
       <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>157db7df530023575515d366c9b672e8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_int_bound_t</type>
       <name>dimension</name>
       <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>c4cf4802b30127a6ae42a1a1798c51b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_string_list_t *</type>
       <name>str</name>
       <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>341be97d9aff90c9978347f66f945b77</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_array_t *</type>
       <name>array</name>
       <anchorfile>unionstp__parameter__t_1_1@0.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>f1f713c9e000f5d3f280adbd124df4f5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_parameter_t::@1</type>
       <name>deflt</name>
       <anchorfile>structstp__parameter__t.html</anchorfile>
-      <anchor>o26</anchor>
+      <anchor>1ae03ed771e3171fae03ed917b22ceff</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_curve_t *</type>
       <name>curve</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>double</type>
       <name>dbl</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>365b8373d0bf6dc9e3450af670cc1d35</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>dimension</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>c4cf4802b30127a6ae42a1a1798c51b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>integer</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>157db7df530023575515d366c9b672e8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>boolean</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>84e2c64f38f78ba3ea5c905ab5a2da27</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const char *</type>
       <name>str</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>341be97d9aff90c9978347f66f945b77</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_array_t *</type>
       <name>array</name>
       <anchorfile>unionstp__parameter__t_1_1@1.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>f1f713c9e000f5d3f280adbd124df4f5</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5683,42 +5683,42 @@
       <type>int</type>
       <name>pass</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>1a1dc91c907325c69271ddf0c944bc72</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>missingstartrows</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>6b75dc88fe75f396206e0c5862d61543</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>logicalpassstart</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>da94ad894675e9119f2c647a94e21605</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassstart</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>13436ac9693968e5601e30fd01451a02</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassend</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>102875318f07394cc762ba839e0b5231</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>subpass</name>
       <anchorfile>structstp__pass__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>769ff675e6c6adb86faf4316c1aa0ba3</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5729,95 +5729,95 @@
       <type>stp_parameter_list_t(*</type>
       <name>list_parameters</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>54879ee9c7f05b72f24bab4bce932970</anchor>
       <arglist>)(const stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>parameters</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>622ce298c6fc93028618fed494c284e9</anchor>
       <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>media_size</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>0893788b2db9b714e8185a0d5bc54c65</anchor>
       <arglist>)(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>imageable_area</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>d910d40510a98935f74705e1e0c53b6d</anchor>
       <arglist>)(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>limit</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>6e40367cc4c593d8c68138abdc46e4ef</anchor>
       <arglist>)(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>print</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>4ba23f8d414bf8d9305fe670b5e7ae94</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>describe_resolution</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>b11ae31fa8984f09a03acc5d284f53f8</anchor>
       <arglist>)(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="variable">
       <type>const char *(*</type>
       <name>describe_output</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>92224ef5b74a148faa0459a1ff6edd6c</anchor>
       <arglist>)(const stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>verify</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>7cc301b263aa0c00e3b8d67b79b9949e</anchor>
       <arglist>)(stp_vars_t *v)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>start_job</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>fd889d531bf42b215023ed01d74fecab</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="variable">
       <type>int(*</type>
       <name>end_job</name>
       <anchorfile>structstp__printfuncs__t.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>f553a87427ad77ead7b8e6bb7f4a2efa</anchor>
       <arglist>)(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
   </compound>
   <compound kind="struct">
     <name>stp_raw_t</name>
     <filename>structstp__raw__t.html</filename>
-    <member kind="variable">
+    <member kind="typedef">
       <type>size_t</type>
       <name>bytes</name>
       <anchorfile>structstp__raw__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>4b3a6218bb3e3a7303e8a171a60fcf92</anchor>
       <arglist></arglist>
     </member>
-    <member kind="variable">
+    <member kind="typedef">
       <type>const void *</type>
       <name>data</name>
       <anchorfile>structstp__raw__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>8d777f385d3dfec8815d20f7496026dc</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5828,21 +5828,21 @@
       <type>double</type>
       <name>value</name>
       <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>2063c1608d6e0baf80249c42e2be5804</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>numsizes</name>
       <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>adae9e852b659d0d064b746f5cc85ee4</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const stp_dotsize_t *</type>
       <name>dot_sizes</name>
       <anchorfile>structstp__shade.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>c4b0221c67b0895782c9c5984cc2578e</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5853,49 +5853,49 @@
       <type>int</type>
       <name>row</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>f1965a857bc285d26fe22023aa5ab50d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>pass</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>1a1dc91c907325c69271ddf0c944bc72</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>jet</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>564f60a2dd82ea24bfa3f2f615348f7c</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>missingstartrows</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>6b75dc88fe75f396206e0c5862d61543</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>logicalpassstart</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>da94ad894675e9119f2c647a94e21605</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassstart</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>13436ac9693968e5601e30fd01451a02</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>physpassend</name>
       <anchorfile>structstp__weave__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>102875318f07394cc762ba839e0b5231</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -5907,84 +5907,84 @@
       <type>stp_array</type>
       <name>stp_array_t</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g69e0971771118ccea2a5dc72ba4fa73e</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gaf63aaff6ea861e16b3addc023ef2e66</anchor>
       <arglist>(int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_destroy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g562ad19d8ecc1e9bdd8c182b0a05ecec</anchor>
       <arglist>(stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gab9b031be229d8762faf46a3ef9454ec</anchor>
       <arglist>(stp_array_t *dest, const stp_array_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_array_t *</type>
       <name>stp_array_create_copy</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g19370f7d4779013904be75bc3d97e024</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g698e51815f2ef3fd0709d6b32a2bb921</anchor>
       <arglist>(stp_array_t *array, int x_size, int y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_size</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g48e34b2673c2973884f0a403bafe7ea8</anchor>
       <arglist>(const stp_array_t *array, int *x_size, int *y_size)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_set_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g0ca3891b4cde193cc65de63053e3f4fa</anchor>
       <arglist>(stp_array_t *array, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_array_get_data</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g9e1c46379b5935ed3a939833bd9e68be</anchor>
       <arglist>(const stp_array_t *array, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_set_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g4ab405205d678a3d9ae02a98103fbfea</anchor>
       <arglist>(stp_array_t *array, int x, int y, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_array_get_point</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>gb9d53cf70f2c892dca82b8db2414fad2</anchor>
       <arglist>(const stp_array_t *array, int x, int y, double *data)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_array_get_sequence</name>
       <anchorfile>group__array.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g2051c3f4a1eaccb198744f8d7c76d649</anchor>
       <arglist>(const stp_array_t *array)</arglist>
     </member>
   </compound>
@@ -5998,128 +5998,93 @@
       <type>stp_color</type>
       <name>stp_color_t</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gb711e2534c69bde47be7af3409c8ee2c</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_init</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g835bd7024477347a46ea0c14b46996c6</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, size_t steps)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_get_row</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gadf861820b3956ef7b18600dbf5da9da</anchor>
       <arglist>(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_color_list_parameters</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>ge2e397268288111eaffd352cb0ff1b98</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_color_describe_parameter</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gc47fecc2c32115494ea364e53d9f1ff2</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_register</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>ge3543409e331c5d1756c2c8fe927343b</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_unregister</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g3e0f2728d47e1701c00b06199bc5512d</anchor>
       <arglist>(const stp_color_t *color)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_color_count</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>ga8b8b19da7bcc9bc814fe0f97f39b3ed</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g25d9ee3ceee6d6e9964007ad12f9900b</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_index</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>ga5ddc4c9d02576154d0b2c6c64a6a033</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_color_t *</type>
       <name>stp_get_color_by_colorfuncs</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>ga92373d7aa315ab6e32a1bb0ac944b79</anchor>
       <arglist>(stp_colorfuncs_t *colorfuncs)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g36d2d72d2cd967405a978b76a7a8c992</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_color_get_long_name</name>
       <anchorfile>group__color.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>ga0559d7812bdcbebe4edc14fc05274d9</anchor>
       <arglist>(const stp_color_t *c)</arglist>
     </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>get_row</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga0</anchor>
-      <arglist>)(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)</arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_parameter_list_t(*</type>
-      <name>list_parameters</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga1</anchor>
-      <arglist>)(const stp_vars_t *v)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>describe_parameter</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga2</anchor>
-      <arglist>)(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *</type>
-      <name>long_name</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga3</anchor>
-      <arglist></arglist>
-    </member>
-    <member kind="variable">
-      <type>const stp_colorfuncs_t *</type>
-      <name>colorfuncs</name>
-      <anchorfile>group__color.html</anchorfile>
-      <anchor>ga4</anchor>
-      <arglist></arglist>
-    </member>
   </compound>
   <compound kind="group">
     <name>curve</name>
@@ -6130,399 +6095,399 @@
       <type>stp_curve</type>
       <name>stp_curve_t</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gd5ce135b7af2c6e79bae493c7055461d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_type_t</name>
-      <anchor>ga47</anchor>
+      <anchor>g7ced905b29f0d85de94258dceb01c3f4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_LINEAR</name>
-      <anchor>gga47a1</anchor>
+      <anchor>gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_TYPE_SPLINE</name>
-      <anchor>gga47a2</anchor>
+      <anchor>gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_wrap_mode_t</name>
-      <anchor>ga48</anchor>
+      <anchor>g1880ff988f772337e8892e791951337b</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_NONE</name>
-      <anchor>gga48a3</anchor>
+      <anchor>gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_WRAP_AROUND</name>
-      <anchor>gga48a4</anchor>
+      <anchor>gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_compose_t</name>
-      <anchor>ga49</anchor>
+      <anchor>gb7d718baf4619b6be6c4aff8ce84aad9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_ADD</name>
-      <anchor>gga49a5</anchor>
+      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_MULTIPLY</name>
-      <anchor>gga49a6</anchor>
+      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_COMPOSE_EXPONENTIATE</name>
-      <anchor>gga49a7</anchor>
+      <anchor>ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_curve_bounds_t</name>
-      <anchor>ga50</anchor>
+      <anchor>gd2b61113497bb142943d5131df3286ae</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_RESCALE</name>
-      <anchor>gga50a8</anchor>
+      <anchor>ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_CLIP</name>
-      <anchor>gga50a9</anchor>
+      <anchor>ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_CURVE_BOUNDS_ERROR</name>
-      <anchor>gga50a10</anchor>
+      <anchor>ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gf6b71d25c497e99ab2c073108b080ab6</anchor>
       <arglist>(stp_curve_wrap_mode_t wrap)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>ge76787e84f2fc3ba299de94f4ecc6d82</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_copy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gfdafb0a802f00063b00713dbd6d6bfc0</anchor>
       <arglist>(stp_curve_t *dest, const stp_curve_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_destroy</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g01bf94ed6a523f28dd909be054a69790</anchor>
       <arglist>(stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g5283a18fcc5db8e9f9384d54de50ba83</anchor>
       <arglist>(stp_curve_t *curve, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_bounds</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g4d32e3000dd3a8f258b2eab94797731b</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_wrap_mode_t</type>
       <name>stp_curve_get_wrap</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gd2aade6a22b516006ce0f897c5027f35</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_is_piecewise</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>gdda4313c874170e0086d2000ed04c02f</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_curve_get_range</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>gaf8bad025ea7463067c9d7ab205af062</anchor>
       <arglist>(const stp_curve_t *curve, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_curve_count_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g48d9023f28ae2d15975002f7a9d7f94e</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g3175711d943e95fdf363d5124237a56e</anchor>
       <arglist>(stp_curve_t *curve, stp_curve_type_t itype)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_type_t</type>
       <name>stp_curve_get_interpolation_type</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gca245aa6907c2fb95e150ce9a86ddb1a</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gba540befdbd82e705358b2175d5b92e8</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gcbd01a2662edb48af0816930b40dc8ab</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>gc0401bfefa3990ca26a0fb7718f1ebb2</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gaf770dcae26ce48d5ee50dd8217e2c14</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g184e0e32892aae4b2c195c6fc880bace</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gbc9ae004e972c7d638336714f3112f9b</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g8a215d4981a74fb2b6e4a0c381314df0</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>gd23dcc9abefca9a98b3ecd9714227093</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g4051de3e6be42f4499de78af67288616</anchor>
       <arglist>(stp_curve_t *curve, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_get_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gd4cfbfbfe0c16b8f2ef4d8c44d221172</anchor>
       <arglist>(const stp_curve_t *curve, size_t start, size_t count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_subrange</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g0ba6753a8beeaca19719d047da25ecb5</anchor>
       <arglist>(stp_curve_t *curve, const stp_curve_t *range, size_t start)</arglist>
     </member>
     <member kind="function">
       <type>const double *</type>
       <name>stp_curve_get_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g24b9486c45d68983e94dcc0fb19edacd</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_point_t *</type>
       <name>stp_curve_get_data_points</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>gd30e41654f1e0217aae3389b30cdffba</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_curve_get_float_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>gf363a0f9686bcd6521671d531bc522d5</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_curve_get_long_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g187af251d5a89853545c8be898a00cc1</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_curve_get_ulong_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g3ecbc0ce98e7bd7695002306f5a2ba1b</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_curve_get_int_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g01bda0b947a6075d4a1ed373865744e6</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_curve_get_uint_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>gb874365285383f3eb35c1a32496a69b4</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_curve_get_short_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g60767bb2143fe4d491d351a4c0abc3b1</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_curve_get_ushort_data</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>gb2312169172ec9789af9fd38279b3273</anchor>
       <arglist>(const stp_curve_t *curve, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const stp_sequence_t *</type>
       <name>stp_curve_get_sequence</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>gee3cc69ab758b400838014df4742c28e</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g6548b7ca6ef6ab94fe1d927c246e7baf</anchor>
       <arglist>(stp_curve_t *curve, double f_gamma)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_curve_get_gamma</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>gc9786b35c2b1a55d54b62bcc57481c82</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_set_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g9a05eae4f274f420418539cceb627556</anchor>
       <arglist>(stp_curve_t *curve, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_get_point</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>gf9ff6f55ec0a0615608dc1baec6aff00</anchor>
       <arglist>(const stp_curve_t *curve, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_interpolate_value</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g0fdfc2b27a8a464584589ef38a8e05c4</anchor>
       <arglist>(const stp_curve_t *curve, double where, double *result)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_resample</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>gf68cf2508ff4a14a0dbee6fc0001667e</anchor>
       <arglist>(stp_curve_t *curve, size_t points)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_rescale</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gd440d8d448173adc2be6737963a6e999</anchor>
       <arglist>(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_write</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g6ef71ce7d92e659b1c902df29b1dcbc7</anchor>
       <arglist>(FILE *file, const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_curve_write_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>g21aa4497c58ebbb703dc3549560f084d</anchor>
       <arglist>(const stp_curve_t *curve)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_stream</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g650e49e1250dab5d9221ad747a627fc0</anchor>
       <arglist>(FILE *fp)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_file</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>g6ff03fcc2a47f297c48b683884e81924</anchor>
       <arglist>(const char *file)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_curve_create_from_string</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g60dce8c741a9b6fde73ced2134305298</anchor>
       <arglist>(const char *string)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_curve_compose</name>
       <anchorfile>group__curve.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>g657e0ad5b93f090220d35be615fec5e4</anchor>
       <arglist>(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)</arglist>
     </member>
   </compound>
@@ -6534,49 +6499,49 @@
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl__internal.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
@@ -6588,49 +6553,49 @@
       <type>#define</type>
       <name>textdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gac0316f33cabc5a70d974c5aba43063b</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>gettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>geb8333d9b46653f2047c603034d26730</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g7fd6ec2ffaa95339754232b69eaac521</anchor>
       <arglist>(Domain, Message)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>dcgettext</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g52d955a76a73f0e86dddd07dda5cd490</anchor>
       <arglist>(Domain, Message, Type)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>bindtextdomain</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gcf29daa2fef5f417c57be476054c695b</anchor>
       <arglist>(Domain, Directory)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd41443e9a10bd2ffa9508bb74c41c2d1</anchor>
       <arglist>(String)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>N_</name>
       <anchorfile>group__intl.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9de9caf5267f08d8164404a1f68b66f5</anchor>
       <arglist>(String)</arglist>
     </member>
   </compound>
@@ -6642,98 +6607,98 @@
       <type>#define</type>
       <name>STP_MAJOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g98b05dcc61492d413bb01421995f1421</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MINOR_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g26319655da45e42c3b498ae7db0bf62c</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_MICRO_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g02b38fef35caed8b676941e8dd8aadae</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CURRENT_INTERFACE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g08cdc7e05ec4d52b2458470b6d0047fb</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_BINARY_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ge754fd2fde377ba0bbe61aee1a31dd9a</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_INTERFACE_AGE</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gfd63347e8d3a71fa8384db59deabbde5</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_CHECK_VERSION</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g26c662a55c391d11663052ca39458972</anchor>
       <arglist>(major, minor, micro)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_check_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g888f2f6268a658d1a6b71b5288299488</anchor>
       <arglist>(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_major_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g19a4efe48689fb8f859d04e60bfe028f</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_minor_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g66def32167cee385762282e36b60d3b7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_micro_version</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g24960731fb86305c31f0be5621ccb993</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_current_interface</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g78c76c5831f5046eee8a56bd010b24dc</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_binary_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g97878c63aacb7d1fa8eed6cf1168c2e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>const unsigned int</type>
       <name>stp_interface_age</name>
       <anchorfile>group__version.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gf242f39e07a0ab2f2e25e1b7bc3e3aac</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -6746,129 +6711,80 @@
       <type>#define</type>
       <name>STP_CHANNEL_LIMIT</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gf71d7111a7215d4c1f1ef1317f9d6cfc</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_image</type>
       <name>stp_image_t</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gc5b6b70cd39959ffd06deab3724d87e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_image_status_t</name>
-      <anchor>ga17</anchor>
+      <anchor>g3378dd231cc63da06de0bb41f1cde78f</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_OK</name>
-      <anchor>gga17a2</anchor>
+      <anchor>gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_IMAGE_STATUS_ABORT</name>
-      <anchor>gga17a8</anchor>
+      <anchor>gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_init</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g74c2417d571861506be7209421a3b418</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_reset</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g69cd20ccb54500d0ee8cf38969db69a6</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_width</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g9ee4915d4a1007f2d9c730ddc96d931b</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_image_height</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g48a99a9a8493b75687ad0900664ca4cb</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>stp_image_status_t</type>
       <name>stp_image_get_row</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gfc93a7a3f6629f6826bf1f6f757f464e</anchor>
       <arglist>(stp_image_t *image, unsigned char *data, size_t limit, int row)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_image_get_appname</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gd36123431e93e049d813894aa039c25c</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_image_conclude</name>
       <anchorfile>group__image.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>gd1017f2f9b91d7add73c2393d96f700a</anchor>
       <arglist>(stp_image_t *image)</arglist>
     </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>reset</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga0</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>width</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga1</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>int(*</type>
-      <name>height</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga2</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>stp_image_status_t(*</type>
-      <name>get_row</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga3</anchor>
-      <arglist>)(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)</arglist>
-    </member>
-    <member kind="variable">
-      <type>const char *(*</type>
-      <name>get_appname</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga4</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void(*</type>
-      <name>conclude</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga5</anchor>
-      <arglist>)(struct stp_image *image)</arglist>
-    </member>
-    <member kind="variable">
-      <type>void *</type>
-      <name>rep</name>
-      <anchorfile>group__image.html</anchorfile>
-      <anchor>ga6</anchor>
-      <arglist></arglist>
-    </member>
   </compound>
   <compound kind="group">
     <name>list</name>
@@ -6878,224 +6794,224 @@
       <type>stp_list_item</type>
       <name>stp_list_item_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g71c64aeca8ca0613215306f088b6a963</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_list</type>
       <name>stp_list_t</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g01be7c3ea8c46226978010d453016f22</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_node_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g3744d9043311d0bcbb21f80e79b9afba</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void *(*</type>
       <name>stp_node_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g589c7c30b003d694b844834a41a6b1fa</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>const char *(*</type>
       <name>stp_node_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g1c6584d7cf0cda45dce5d95249af6470</anchor>
       <arglist>)(const void *)</arglist>
     </member>
     <member kind="typedef">
       <type>int(*</type>
       <name>stp_node_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd7ac92a42bf2184103e0a83147d1835f</anchor>
       <arglist>)(const void *, const void *)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_node_free_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gb357e17f729e41b4f96d6aada1be26b9</anchor>
       <arglist>(void *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gaf10e4bb8ce6a8b6f5f015475400eb1b</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_t *</type>
       <name>stp_list_copy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g3bd2f5a42d3313287017bfe20859c2d9</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g1382e926901b5efa2356176826a96a1a</anchor>
       <arglist>(stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_start</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>ga67c8173f8c7b2c40e3d6dde6578faec</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_end</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g2ef0298e970fdb93955860e7ee3f878c</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_index</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g9885458dd0f6e6fe5c88c4b2b0643e2a</anchor>
       <arglist>(const stp_list_t *list, int idx)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g0fd0ea2439ab2b0c9b9fb97f14c9a470</anchor>
       <arglist>(const stp_list_t *list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_get_item_by_long_name</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gdbf12ab6f47d68f2605f211023c4f520</anchor>
       <arglist>(const stp_list_t *list, const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_get_length</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g013ca40ec7e5714fc5ee5f31ac5582bc</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gc103cb4ff8870b3a8d90b6ebcade2498</anchor>
       <arglist>(stp_list_t *list, stp_node_freefunc freefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_freefunc</type>
       <name>stp_list_get_freefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g9d344e3c6874e6033f8fc71370678bcf</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gec59dd3b87efc811ef2b6303102ed279</anchor>
       <arglist>(stp_list_t *list, stp_node_copyfunc copyfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_copyfunc</type>
       <name>stp_list_get_copyfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g310dd79907494b07d9005fbf50b9eb0c</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g97d7c6d659aa7d05bc54a349a07e10c0</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g468cc0a5dfb1bfbef9eebd8d4f644492</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g42bdba5fcb861bdf8facb9135039d9b8</anchor>
       <arglist>(stp_list_t *list, stp_node_namefunc long_namefunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_namefunc</type>
       <name>stp_list_get_long_namefunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>ga95d8ace9b6ec71388007024c51865cb</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_list_set_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gbad08ce8ef257dae054ea3816ae88fe7</anchor>
       <arglist>(stp_list_t *list, stp_node_sortfunc sortfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_node_sortfunc</type>
       <name>stp_list_get_sortfunc</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>ga759fd3cb97b9f651424b8a8fb6bedaa</anchor>
       <arglist>(const stp_list_t *list)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_create</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g50f49648801707436012cd5dc66b1f8c</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *next, const void *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_destroy</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>gde2acf279e8ea067fdc1f3f951d0b373</anchor>
       <arglist>(stp_list_t *list, stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_prev</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>gcee23493eafdfcfce51e2ccf29ebbf54</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_list_item_t *</type>
       <name>stp_list_item_next</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>gea9c1b6daae518ebecd2981289c555f3</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_list_item_get_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g5b7d8ffea5a806953a43aee961a60fe4</anchor>
       <arglist>(const stp_list_item_t *item)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_list_item_set_data</name>
       <anchorfile>group__list.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g1b5d2889a81d712c3ba024e53bfd0f38</anchor>
       <arglist>(stp_list_item_t *item, void *data)</arglist>
     </member>
   </compound>
@@ -7106,62 +7022,62 @@
     <class kind="struct">stp_papersize_t</class>
     <member kind="enumeration">
       <name>stp_papersize_unit_t</name>
-      <anchor>ga5</anchor>
+      <anchor>gbb66a8f6ce85d70afd9fe42472b492d8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_STANDARD</name>
-      <anchor>gga5a0</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_STANDARD</name>
-      <anchor>gga5a1</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_ENGLISH_EXTENDED</name>
-      <anchor>gga5a2</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PAPERSIZE_METRIC_EXTENDED</name>
-      <anchor>gga5a3</anchor>
+      <anchor>ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_known_papersizes</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g93eb4d6bc44914b3ea6b184e076a0853</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_name</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g9d655e3de6954ad3c5933dc736d2509a</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g0438b0e4729f37579900b591e801f8ce</anchor>
       <arglist>(int length, int width)</arglist>
     </member>
     <member kind="function">
       <type>const stp_papersize_t *</type>
       <name>stp_get_papersize_by_index</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g08bb891f58a7decfee2b073c00715993</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_default_media_size</name>
       <anchorfile>group__papersize.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>g2fe5d85acaa4ff8b8e4ad1ff3cccb027</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
   </compound>
@@ -7175,182 +7091,182 @@
       <type>stp_printer</type>
       <name>stp_printer_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g1a68662b730d44c11de6fb8226a309f6</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>stp_family</type>
       <name>stp_family_t</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g5c0458c3c1d19474e0245c47dac29e70</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_model_count</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>gc0a8108170f5c86621de14296fd94b1e</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_index</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g1286559c60d239563f9f15fdd27996e0</anchor>
       <arglist>(int idx)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gc041944e528afcb9a795eb6ece3fc6ff</anchor>
       <arglist>(const char *long_name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g947fa230e08f9c854ca2608e76bd0d58</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const stp_printer_t *</type>
       <name>stp_get_printer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>gcb4cdcada01ff29c5fd4ffeaa576db9e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_printer_index_by_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>g6f32b0213b580bf081fc8752a3eb04a1</anchor>
       <arglist>(const char *driver)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_long_name</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g00182878bdc39935e6382d7e41d55294</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_driver</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g6c6c426f86307660079277ab6e90ae3d</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_family</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g9c98ccc58b2c6f9ed6bd1025220ff77d</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_printer_get_manufacturer</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gfc0382fd32b49ea9d171e4ce8b750c62</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_printer_get_model</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g7ba104f0ea5ce4a88175486894010b71</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_printer_get_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>ge67398e65540b835f5c5d073c5ea0ec1</anchor>
       <arglist>(const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>gc3d8cdb65382cb13ea6b01072e6240d5</anchor>
       <arglist>(stp_vars_t *v, const stp_printer_t *p)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_print</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g121125e6646c6f6d8965f1857450749e</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_start_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g9cf59fba866430dd47508bac6561ef67</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_end_job</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g40637834f08a166992325af09f6a6030</anchor>
       <arglist>(const stp_vars_t *v, stp_image_t *image)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_model_id</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gc09e99e20c8a19a13a5fb6356742a92a</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify_printer_params</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>gd91f8e7a622725f0d47196cf912ddd8d</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_register</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g82b22438444849bdedb4cfbe22f209e8</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_family_unregister</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>ga2ab30a5e5442b7a552fc3b884e1511b</anchor>
       <arglist>(stp_list_t *family)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_initialize_printer_defaults</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gc9aba62164667822fd9f110740bab570</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_printer_list_parameters</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g666486047edfe4405d003b5c3bbe4b49</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_printer_describe_parameter</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g806f00d4167762c7a3d467ec37c8430e</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_describe_output</name>
       <anchorfile>group__printer.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g950e2cd193926440ba250dbc184d8588</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
   </compound>
@@ -7362,203 +7278,203 @@
       <type>stp_sequence</type>
       <name>stp_sequence_t</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gb3d4cae653c4303a6e5d26b516694c92</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>g771327bed5a71d8d33cc6b3ec5cbdbee</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_destroy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g98c9c2859d2ebe9b1987d26b62bd6ce0</anchor>
       <arglist>(stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g5792d6f821525514199dd2d9b332ddd4</anchor>
       <arglist>(stp_sequence_t *dest, const stp_sequence_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_sequence_t *</type>
       <name>stp_sequence_create_copy</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gd37eb66db88ac93b853ba6e02b9155bc</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>gd56df3112937c11431e033f2d9574b96</anchor>
       <arglist>(stp_sequence_t *sequence, double low, double high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_bounds</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g392e1da122d95d6fc07b6d73eff1d311</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_range</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gc2c70c539a3eced45be306d082faa3a6</anchor>
       <arglist>(const stp_sequence_t *sequence, double *low, double *high)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g166e9a610bd53cb812e328d9e111f240</anchor>
       <arglist>(stp_sequence_t *sequence, size_t size)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_sequence_get_size</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g99292c5ba10bcf1574c3e71a593c3e5f</anchor>
       <arglist>(const stp_sequence_t *sequence)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g24024e771a50db02f2713b244212603e</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_subrange</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>g9b41ba7e0f1fb00cf19bbb9efe70824d</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, size_t size, const double *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_sequence_get_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>gc33208fae031bd1111f8ceb4c1425199</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *size, const double **data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gf7f49101192387e29399ded6d3166d13</anchor>
       <arglist>(stp_sequence_t *sequence, size_t where, double data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_get_point</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g044210129f28c298152ce124371324d4</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t where, double *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g34a526cb5e72b611ac8a98b559c24e2e</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const float *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>gd15e2cf350bb311da58f4b11240fa0f2</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>gbc7ec322716d761436e4ad2d5d2f756f</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned long *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gd4f058b2c690ad4e326970cc841d8f79</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g40cd6256eb5bb72decd60edd1dc3be54</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned int *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>ge0d6719f863a10422dea23e7f4b4dd29</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const short *data)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_sequence_set_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>g68aed44bbf6ede9ac49237091f2deb43</anchor>
       <arglist>(stp_sequence_t *sequence, size_t count, const unsigned short *data)</arglist>
     </member>
     <member kind="function">
       <type>const float *</type>
       <name>stp_sequence_get_float_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>gf8cd9da688af479103cf8600e48f61c9</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const long *</type>
       <name>stp_sequence_get_long_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g864b55caa3a8c0e573031a36f57f7cc4</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned long *</type>
       <name>stp_sequence_get_ulong_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>gc4557b9fba98a7fbb4e17cc18fb0dded</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const int *</type>
       <name>stp_sequence_get_int_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g4396baf0d338eec6f3bce3e2000da978</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned int *</type>
       <name>stp_sequence_get_uint_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g204f77e91c9283dc6ec6e742687bb0db</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const short *</type>
       <name>stp_sequence_get_short_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g91a68efd6b99150739c7706f65703a2f</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
     <member kind="function">
       <type>const unsigned short *</type>
       <name>stp_sequence_get_ushort_data</name>
       <anchorfile>group__sequence.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g8bf46faeea891ac7ca699591df596bc1</anchor>
       <arglist>(const stp_sequence_t *sequence, size_t *count)</arglist>
     </member>
   </compound>
@@ -7570,385 +7486,385 @@
       <type>#define</type>
       <name>STP_DBG_LUT</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>g9ef88b326f83d342849fa89c33c7e4a7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_COLORFUNC</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g3560e33ba80d2a0ceb07fe51fac845be</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_INK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g328a4b66d0767134649ce30b243931c9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>g8d8211f97675b37f18bff822757d04b3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PCL</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>g30a9efd31b78debefd550d0b337ec795</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ESCP2</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g158e1ea4acff071440681ba678b6fb0b</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CANON</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>ga0d6b1a8d780b3c5f970454678bc0323</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LEXMARK</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>gb8180ab505c2d7c5a717a53096ac770c</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_WEAVE_PARAMS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>gc746369f247dc346bcbdeacb1abbdbcb</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_ROWS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>gb764d477ebf0db4957cc316badac70bd</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MARK_FILE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g9c8f6255efb1fcf9cd3e7a68466e44ba</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_LIST</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>gcb3d85de1088cf795cfeaa9e1450c4e0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_MODULE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g6d69d079a3d7a3e0e2b870e1e9417187</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PATH</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>gb11ef5f0ed150be2d3b999b7fc7e4f24</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PAPER</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>g08f48f3423e848f1932435c5f8e94ff7</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_PRINTERS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>g7bbbf3d31a1a4f6b0da808184e1c1587</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_XML</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>g51aee81a3d2a33d42417f6b61bb63f5e</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_VARS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>g52844a51058ca29f975b5666743622ac</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_OLYMPUS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>g4dc6609c9bb0c256fec7361f41a5c45f</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g9eaf8d50f127cd4316bf68ad34092551</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_DBG_CURVE_ERRORS</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>gc80b8553e636ec01fe4e975d9f7668b9</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STP_SAFE_FREE</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>g44a234fbf1ab832399fc674c8cb53b1f</anchor>
       <arglist>(x)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_init</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>g69354e5830712093045a4ba290a298f8</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_set_output_codeset</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gf7978ce9e414b3d8ad905ee36a51cfbd</anchor>
       <arglist>(const char *codeset)</arglist>
     </member>
     <member kind="function">
       <type>stp_curve_t *</type>
       <name>stp_read_and_compose_curves</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g21168356d466d278f11dab2be8d0016e</anchor>
       <arglist>(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_abort</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>g9b6b2745ee2d68d1ca356a79c50f0ed7</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_prune_inactive_options</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gf64336e7c536a51d0debe88f1f5ec90a</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_zprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g18aaa3874e4dd5259a4d182fa8d9c90a</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_zfwrite</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9135d4c8cac78593aff55b668d09b79c</anchor>
       <arglist>(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_putc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gf07e31a63021b4d504cc5a410e1aeb08</anchor>
       <arglist>(int ch, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g01199dc1d5a3db973d22cc9db00a4f41</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put16_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g3c20beae37d9841e095b336d6f7dcc1d</anchor>
       <arglist>(unsigned short sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_le</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g0a445c531388afa31650ef4ccdac3ae1</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_put32_be</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>gbe0e31fbc0c4e6374903b25edc594f5e</anchor>
       <arglist>(unsigned int sh, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_puts</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>g0a59761c8a4ee5f31cfb9bec2a9b00b4</anchor>
       <arglist>(const char *s, const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_send_command</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>g23ee64de1ec6ef5a4941ab80ba609840</anchor>
       <arglist>(const stp_vars_t *v, const char *command, const char *format,...)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_erputc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g859b75eddde620338859121451096097</anchor>
       <arglist>(int ch)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_eprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g47c73485971132d9b41a33bdf572f670</anchor>
       <arglist>(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_erprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g5f6389ed7d500f851cabe8425a158e4b</anchor>
       <arglist>(const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_asprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g6bdd7099220fe310b228dcff5159b8d9</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void void</type>
       <name>stp_catprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>g34d3ebda7c5b75ab40d1600f4d79a4be</anchor>
       <arglist>(char **strp, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>unsigned long</type>
       <name>stp_get_debug_level</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>g9ab4c35dd4b6e142281ff36ecedee27e</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_dprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>g24e214e32810cc67c493c270a6ad83d6</anchor>
       <arglist>(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void</type>
       <name>stp_deprintf</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>gf7bc1bd0ff92ca0f6ba7d0eb559e1da3</anchor>
       <arglist>(unsigned long level, const char *format,...) __attribute__((format(__printf__</arglist>
     </member>
     <member kind="function">
       <type>void void void</type>
       <name>stp_init_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g26a43ceec27ca34bc49f4806900b4618</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_flush_debug_messages</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>gf39c22b74843750ca74a6caccb263c7c</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_malloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g7c76d059684ee6dc5bdc06e4b3af18ef</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_zalloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>gae1d98650ef9777ae4f4b10eae60b5c9</anchor>
       <arglist>(size_t)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_realloc</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>g908f11aeabf31c8a9621bd65d408a5fc</anchor>
       <arglist>(void *ptr, size_t)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_free</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>gabf89ff6213b9dc568fbdd1342b663ad</anchor>
       <arglist>(void *ptr)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_strlen</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g054943d301baecba82cdb78b7e454880</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strndup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g2c6b28a35780bfa7d03a2f8381ee82c2</anchor>
       <arglist>(const char *s, int n)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stp_strdup</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g2f861f4a98ad496ca8cd995147867f32</anchor>
       <arglist>(const char *s)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>g77022a2cfde3a9ba9269f1bc3726175c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_release_version</name>
       <anchorfile>group__util.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>ged2a65d98cba1fd6d48c0cc1b611ae0f</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
@@ -7964,1101 +7880,1101 @@
       <type>stp_vars</type>
       <name>stp_vars_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga0</anchor>
+      <anchor>gde33aeed00b53e4af71ee1f7c4326279</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void *</type>
       <name>stp_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga1</anchor>
+      <anchor>gb264246d4b7e584447b5f39ed8f7ee05</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>const void *</type>
       <name>stp_const_parameter_list_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga2</anchor>
+      <anchor>g73ac4d52cb5cecbb9694e9038fb7ea82</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_outfunc_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga3</anchor>
+      <anchor>gd11be815334025415a8e2023e0cd44c5</anchor>
       <arglist>)(void *data, const char *buffer, size_t bytes)</arglist>
     </member>
     <member kind="typedef">
       <type>void *(*</type>
       <name>stp_copy_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga4</anchor>
+      <anchor>gd31fc080a2bd980c6a05a541dc1612a3</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>void(*</type>
       <name>stp_free_data_func_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga5</anchor>
+      <anchor>g3f7233002f4db790a077e33c2661665c</anchor>
       <arglist>)(void *)</arglist>
     </member>
     <member kind="typedef">
       <type>stp_compdata</type>
       <name>compdata_t</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga6</anchor>
+      <anchor>g9ee295029ad2d072b4099dc390359900</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_type_t</name>
-      <anchor>ga132</anchor>
+      <anchor>ge031ab2c7ff60007e284ed71a73111e5</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_STRING_LIST</name>
-      <anchor>gga132a7</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INT</name>
-      <anchor>gga132a8</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_BOOLEAN</name>
-      <anchor>gga132a9</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DOUBLE</name>
-      <anchor>gga132a10</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_CURVE</name>
-      <anchor>gga132a11</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_FILE</name>
-      <anchor>gga132a12</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_RAW</name>
-      <anchor>gga132a13</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_ARRAY</name>
-      <anchor>gga132a14</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_DIMENSION</name>
-      <anchor>gga132a15</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_TYPE_INVALID</name>
-      <anchor>gga132a16</anchor>
+      <anchor>gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_class_t</name>
-      <anchor>ga133</anchor>
+      <anchor>g13c0565b3039fa25fd77092a578d44e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_FEATURE</name>
-      <anchor>gga133a17</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_OUTPUT</name>
-      <anchor>gga133a18</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_CORE</name>
-      <anchor>gga133a19</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_CLASS_INVALID</name>
-      <anchor>gga133a20</anchor>
+      <anchor>gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_level_t</name>
-      <anchor>ga134</anchor>
+      <anchor>gaa13470b0a857e96dbe70882b3fb8ebe</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_BASIC</name>
-      <anchor>gga134a21</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED</name>
-      <anchor>gga134a22</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED1</name>
-      <anchor>gga134a23</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED2</name>
-      <anchor>gga134a24</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED3</name>
-      <anchor>gga134a25</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_ADVANCED4</name>
-      <anchor>gga134a26</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INTERNAL</name>
-      <anchor>gga134a27</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_EXTERNAL</name>
-      <anchor>gga134a28</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_LEVEL_INVALID</name>
-      <anchor>gga134a29</anchor>
+      <anchor>ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_activity_t</name>
-      <anchor>ga135</anchor>
+      <anchor>gb11c7af74fa0595684377cafe4d4eb53</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_INACTIVE</name>
-      <anchor>gga135a30</anchor>
+      <anchor>ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_DEFAULTED</name>
-      <anchor>gga135a31</anchor>
+      <anchor>ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STP_PARAMETER_ACTIVE</name>
-      <anchor>gga135a32</anchor>
+      <anchor>ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>stp_parameter_verify_t</name>
-      <anchor>ga136</anchor>
+      <anchor>g1d02c21b8f025b121dd340db9adf3516</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_BAD</name>
-      <anchor>gga136a33</anchor>
+      <anchor>gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_OK</name>
-      <anchor>gga136a34</anchor>
+      <anchor>gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>PARAMETER_INACTIVE</name>
-      <anchor>gga136a35</anchor>
+      <anchor>gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga7</anchor>
+      <anchor>gae35d353b6f86b1cbb97bb0b271f5c9a</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga8</anchor>
+      <anchor>g165ae58fed1515b5466ab1b84df85a86</anchor>
       <arglist>(stp_vars_t *dest, const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>stp_vars_t *</type>
       <name>stp_vars_create_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga9</anchor>
+      <anchor>g3c6d765cc5a27b322289e9baa9d97098</anchor>
       <arglist>(const stp_vars_t *source)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_vars_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga10</anchor>
+      <anchor>g78259fcaa881655a07ef0b2b457bdf70</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga11</anchor>
+      <anchor>ga8d9dbb1e613cfe2b119668158e35a76</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_driver_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga12</anchor>
+      <anchor>ge303a6ed77135b691ebbfd56cb577531</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_driver</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga13</anchor>
+      <anchor>gcf8efdb6fd9847e41c85f9491a252f01</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga14</anchor>
+      <anchor>g335e7eb264fa22343765146fb2318b31</anchor>
       <arglist>(stp_vars_t *v, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_color_conversion_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga15</anchor>
+      <anchor>g3164aa99994dabb561d6c295eb647123</anchor>
       <arglist>(stp_vars_t *v, const char *val, int bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_color_conversion</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga16</anchor>
+      <anchor>g087136342c500c138d73dbe0e2aad11a</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga17</anchor>
+      <anchor>g5d675ab9877df60ec467a20a0d62fcbc</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_left</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga18</anchor>
+      <anchor>gd3fbd778898c2b0fba19d0937fb939f5</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga19</anchor>
+      <anchor>gaa76e04fcde3aa6c162fb9d2fcaca251</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_top</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga20</anchor>
+      <anchor>gcda38fc8e26a75c2b5d246b4341a8fd3</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga21</anchor>
+      <anchor>gdbdd8bad1742e87b5c5a299c2ebf7cf4</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga22</anchor>
+      <anchor>g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga23</anchor>
+      <anchor>g68110f6d19b3987f6f66baee3926eb89</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga24</anchor>
+      <anchor>g7623276e130cb684670ecb153300ebaf</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga25</anchor>
+      <anchor>g751759cdeb8feb061c00f35d37fea45c</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_width</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga26</anchor>
+      <anchor>gea14f3cad139fc5b8d547a252deacff3</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga27</anchor>
+      <anchor>g775714bf75f1fdbdd895f59edc9eca55</anchor>
       <arglist>(stp_vars_t *v, int val)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_page_height</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga28</anchor>
+      <anchor>g94d8cf912e3b036f67bc2d4c37d733ff</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga29</anchor>
+      <anchor>g30d5438686c8ead9a092f98bf3c3d8ca</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_outfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga30</anchor>
+      <anchor>g095834813ebbe8985d443e1fa78a0b98</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga31</anchor>
+      <anchor>ge89d8eb48e4a7a8107b87a44a4318064</anchor>
       <arglist>(stp_vars_t *v, stp_outfunc_t val)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stp_get_errfunc</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga32</anchor>
+      <anchor>g9fe5b4efdfaa3e79918dd5079e61e2c5</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga33</anchor>
+      <anchor>g8fef23ae01a368f4d16ad95813d97d6d</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_outdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga34</anchor>
+      <anchor>g54e35f94578f346c07718587f18b049c</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga35</anchor>
+      <anchor>g7a006418c4dbb265be71f7b5a202455d</anchor>
       <arglist>(stp_vars_t *v, void *val)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_errdata</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga36</anchor>
+      <anchor>ge66b9c64f5821ee6e95f4b9e18cadd4e</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_merge_printvars</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga37</anchor>
+      <anchor>gc970fc314c6418d9193d93c787b908d9</anchor>
       <arglist>(stp_vars_t *user, const stp_vars_t *print)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_get_parameter_list</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga38</anchor>
+      <anchor>g955b215a88b868cfc74d7a340de9b8f6</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>size_t</type>
       <name>stp_parameter_list_count</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga39</anchor>
+      <anchor>gf69f651a798e9f06c67baf06f0754228</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga40</anchor>
+      <anchor>g3dea1f995d40482b9f6470fedd994f95</anchor>
       <arglist>(stp_const_parameter_list_t list, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_list_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga41</anchor>
+      <anchor>g96fc73864dfc00ae418f14a81c72be26</anchor>
       <arglist>(stp_const_parameter_list_t list, size_t item)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga42</anchor>
+      <anchor>gd0f6c2b153638f551d7709780eb7276a</anchor>
       <arglist>(stp_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_create</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga43</anchor>
+      <anchor>g3c1ddd3c10c367c0912fdd841576278f</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_add_param</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga44</anchor>
+      <anchor>ga8dc4ff543dbc1882d673b25234088b6</anchor>
       <arglist>(stp_parameter_list_t list, const stp_parameter_t *item)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_list_t</type>
       <name>stp_parameter_list_copy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga45</anchor>
+      <anchor>g62c6225b0721d5c80d889edc307f0b6b</anchor>
       <arglist>(stp_const_parameter_list_t list)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_list_append</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga46</anchor>
+      <anchor>gf8aa1d7aba11de5fdee95b9cb339be61</anchor>
       <arglist>(stp_parameter_list_t list, stp_const_parameter_list_t append)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga47</anchor>
+      <anchor>ged453c314365a3948b195e3175455a12</anchor>
       <arglist>(const stp_vars_t *v, const char *name, stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_parameter_description_destroy</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga48</anchor>
+      <anchor>gc5a3eb0348d31acf60772265c3896542</anchor>
       <arglist>(stp_parameter_t *description)</arglist>
     </member>
     <member kind="function">
       <type>const stp_parameter_t *</type>
       <name>stp_parameter_find_in_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga49</anchor>
+      <anchor>g711cf3e5e52fd3434ef7a9d16654aea8</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga50</anchor>
+      <anchor>g22338d64a871a8b279fdee6fd83fff7f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga51</anchor>
+      <anchor>g5182246d4e0653f73dfaa40b62d4285f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga52</anchor>
+      <anchor>g8134e4dc36b063a7d7dd229b9df32726</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga53</anchor>
+      <anchor>g6e6c5474c253a452073eba25251a1481</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga54</anchor>
+      <anchor>g82f7bbcf639c60678c1dc2aee24e8a24</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga55</anchor>
+      <anchor>g8c6cd5f3bb3ab59a4f06c020c062c13e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga56</anchor>
+      <anchor>g778b0e43aad1e011012b8071b469c694</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga57</anchor>
+      <anchor>g8f67ed7dcee969e77374fb4daf468d58</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga58</anchor>
+      <anchor>g5f4adaadb80cd2d94569881d96cfa02e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga59</anchor>
+      <anchor>g1f63514f8ffd8ea56f0beee69398ee01</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga60</anchor>
+      <anchor>gd40038a74fa7548da5fcaec6687c8787</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_scale_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga61</anchor>
+      <anchor>gec605c647cab13d61ab5e2822d9f7ead</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double scale)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga62</anchor>
+      <anchor>g71306c3e3118d9a4545b0a3cefb863ea</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_string_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga63</anchor>
+      <anchor>g65b18994af3384af04e2bf77e288f54f</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga64</anchor>
+      <anchor>gae28e4c640fba005a72e92af66327b50</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_file_parameter_n</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga65</anchor>
+      <anchor>gdeae102d1bd65147221f56e6095f35ef</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga66</anchor>
+      <anchor>g59b79c779211a72de534fb9e61548f97</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, double value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga67</anchor>
+      <anchor>gbf1d9c938d364598414e9f15c41c1f08</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga68</anchor>
+      <anchor>g18b8a4fb414245d2c30df9ee11057845</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga69</anchor>
+      <anchor>gd286782f691998858e30a202506bad74</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga70</anchor>
+      <anchor>gdd7769bfece8597cde869eced1239a1e</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_curve_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga71</anchor>
+      <anchor>ga1620e4be3c7fb85262802338d3143f6</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const stp_array_t *value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_default_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga72</anchor>
+      <anchor>gf95184ecee86a92db2a7d3f050154a46</anchor>
       <arglist>(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga73</anchor>
+      <anchor>ga59b141facb320c409d9071f469fdbc5</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stp_get_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga74</anchor>
+      <anchor>g5efb45e6883a2522fd7e78c6eb761c79</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>double</type>
       <name>stp_get_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga75</anchor>
+      <anchor>g46195f69cc57bd18a4cde5756dd84601</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga76</anchor>
+      <anchor>g22bc2b8307fb6a95dac7fcf3d35bf6b9</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga77</anchor>
+      <anchor>gb4121cba599314c929d04cce0e850473</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga78</anchor>
+      <anchor>g4cc8b69619067f882035cca46e9ce0cd</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_curve_t *</type>
       <name>stp_get_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga79</anchor>
+      <anchor>g1a5a2746548465d681d00c6301a26100</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_array_t *</type>
       <name>stp_get_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga80</anchor>
+      <anchor>gb918206f9b70fff5d58a16a762295981</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>const stp_raw_t *</type>
       <name>stp_get_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga81</anchor>
+      <anchor>g9f4db93fc31ad52018bc3ad14b58bfc2</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga82</anchor>
+      <anchor>gc7fe8cd335309d755fe5b54bf6b8e5a3</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga83</anchor>
+      <anchor>g7acde85eb361525f5cf481bafddbc1bd</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga84</anchor>
+      <anchor>g740a5cab681f30b8cc5e4ca18197e472</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga85</anchor>
+      <anchor>g4841e9250e4c7f38f2267355402ffcc1</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga86</anchor>
+      <anchor>g28203d9250f232f9af290802cf2db881</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga87</anchor>
+      <anchor>ge5b7e3356b3c1c893620fdeeea486e48</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga88</anchor>
+      <anchor>g9e992f880bd74cd4097527a39aea7125</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga89</anchor>
+      <anchor>gb9df68cbf9973203adfca5e1293b300a</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_clear_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga90</anchor>
+      <anchor>ga79b051578077beca548be224062705c</anchor>
       <arglist>(stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga91</anchor>
+      <anchor>g44793f2cf64b11917b8943d20ee43b9d</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga92</anchor>
+      <anchor>g8c04ab4487623a41e0b2600d466a88ad</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga93</anchor>
+      <anchor>g38a95079fd6f90a0c6a92c5ddeb104ca</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga94</anchor>
+      <anchor>g1c724bc85737bf8c698a08bc2d441b3e</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga95</anchor>
+      <anchor>g6fa1953ee96051566a261f3391da3857</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga96</anchor>
+      <anchor>ge12a7edf773cbe04fb98b171ba2c2fb9</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga97</anchor>
+      <anchor>g160150a3a39d66f5a807d1c750a57890</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga98</anchor>
+      <anchor>gf2aada3c00f9b00bc6a65014da87e250</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga99</anchor>
+      <anchor>g9fe388535a67f8360ab21f58233c0e17</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_string_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga100</anchor>
+      <anchor>gae6b21f76f675516e9189c47444e17cf</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_file_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga101</anchor>
+      <anchor>gb411dae8fb16ec9f289d4f2f1ecabcfc</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_float_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga102</anchor>
+      <anchor>g2deea3612965e28cd0d513c5850ca074</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_int_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga103</anchor>
+      <anchor>g056b021334fe812aa14bbbfd60aafba8</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_dimension_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga104</anchor>
+      <anchor>gcdfa2f747081721c03b10484a832a535</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_boolean_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga105</anchor>
+      <anchor>gadfd66825dd58fb8e0851d493445c4e4</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_curve_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga106</anchor>
+      <anchor>geecfc1f1fdc97ea165ae35b64de95178</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_array_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga107</anchor>
+      <anchor>gdf6c305c48d012bc138db025c9bd63df</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_check_raw_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga108</anchor>
+      <anchor>g5bd30b408d6ec16b3999dce5e540a5fa</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_string_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga109</anchor>
+      <anchor>gda8dd20ab17a9b403c68b4cd86fb529c</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_file_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga110</anchor>
+      <anchor>g0f09e85b570ffee4a4d94853bb22bcb3</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_float_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga111</anchor>
+      <anchor>g28d01beda4b54cec395654847dbbc301</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_int_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga112</anchor>
+      <anchor>gac76d8e06c3ce3fb0f27c0c80d6ad5fc</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_dimension_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga113</anchor>
+      <anchor>g8125d08f90002e654f2e45427e2f0251</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_boolean_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga114</anchor>
+      <anchor>g361d0ba27ad2ec9e99e5eec05f2e76a6</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_curve_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga115</anchor>
+      <anchor>gb686075ecbdf349387c356826b432191</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_array_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga116</anchor>
+      <anchor>g64e5f74483ffb7bd4412f4eefeb22250</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_activity_t</type>
       <name>stp_get_raw_parameter_active</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga117</anchor>
+      <anchor>g57abcfb2fa58e743f9d30f579481845a</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_media_size</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga118</anchor>
+      <anchor>ge690d9171bcdb0fedf981804bb923fac</anchor>
       <arglist>(const stp_vars_t *v, int *width, int *height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_imageable_area</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga119</anchor>
+      <anchor>gebcb03afca6bb0d94e71bdf570d09af9</anchor>
       <arglist>(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_get_size_limit</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga120</anchor>
+      <anchor>gf2c1a37f8d837fae61bb18de1cd7bdc3</anchor>
       <arglist>(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_describe_resolution</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga121</anchor>
+      <anchor>g5735451225c2a355cb11c165e011637d</anchor>
       <arglist>(const stp_vars_t *v, int *x, int *y)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_verify</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga122</anchor>
+      <anchor>ge28b0d78641811b1625a52971a2d11fa</anchor>
       <arglist>(stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>const stp_vars_t *</type>
       <name>stp_default_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga123</anchor>
+      <anchor>g9f897908b19f5f0cdaf75b483d46e041</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_allocate_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga124</anchor>
+      <anchor>geb61df54d59bfebdcb77b1e5e993ebaa</anchor>
       <arglist>(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_destroy_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga125</anchor>
+      <anchor>g089f9a34f26f700f43858ba3959d8f13</anchor>
       <arglist>(stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stp_get_component_data</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga126</anchor>
+      <anchor>g8eea0724106ea7174b808026ae8d1a5c</anchor>
       <arglist>(const stp_vars_t *v, const char *name)</arglist>
     </member>
     <member kind="function">
       <type>stp_parameter_verify_t</type>
       <name>stp_verify_parameter</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga127</anchor>
+      <anchor>gf64e586fca554f2dd65157a76eaad34a</anchor>
       <arglist>(const stp_vars_t *v, const char *parameter, int quiet)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stp_get_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga128</anchor>
+      <anchor>ga1b826f02f84aa038c6862575770b629</anchor>
       <arglist>(const stp_vars_t *v)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_set_verified</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga129</anchor>
+      <anchor>g8a2924dd6393431e994d22c704ec25fc</anchor>
       <arglist>(stp_vars_t *v, int value)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_copy_options</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga130</anchor>
+      <anchor>gbd8b19b70d2f2fc7dcd7c896b3ed5d98</anchor>
       <arglist>(stp_vars_t *vd, const stp_vars_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stp_fill_parameter_settings</name>
       <anchorfile>group__vars.html</anchorfile>
-      <anchor>ga131</anchor>
+      <anchor>g6a08746f33133e8873236b35eb1e7a62</anchor>
       <arglist>(stp_parameter_t *desc, const stp_parameter_t *param)</arglist>
     </member>
   </compound>
   <compound kind="dir">
     <name>include/gutenprint/</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprint/</path>
-    <filename>dir_000001.html</filename>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprint/</path>
+    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html</filename>
     <file>array.h</file>
     <file>bit-ops.h</file>
     <file>channel.h</file>
@@ -9087,8 +9003,8 @@
   </compound>
   <compound kind="dir">
     <name>include/</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/</path>
-    <filename>dir_000000.html</filename>
+    <path>/home/rleigh/gutenprint-debian-dist/include/</path>
+    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html</filename>
     <dir>include/gutenprint/</dir>
   </compound>
 </tagfile>
diff --git a/doc/gutenprint/html/annotated.html b/doc/gutenprint/html/annotated.html
index 980db91..b7fcba2 100644
--- a/doc/gutenprint/html/annotated.html
+++ b/doc/gutenprint/html/annotated.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Structures</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindexHL" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td><td class="indexvalue"></td></tr>
@@ -40,8 +55,8 @@
   <tr><td class="indexkey"><a class="el" href="structstp__shade.html">stp_shade</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstp__weave__t.html">stp_weave_t</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/array_8h.html b/doc/gutenprint/html/array_8h.html
index 51bce41..39913b1 100644
--- a/doc/gutenprint/html/array_8h.html
+++ b/doc/gutenprint/html/array_8h.html
@@ -2,60 +2,74 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/array.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>array.h File Reference</h1>Array functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="sequence_8h.html">gutenprint/sequence.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga0">stp_array_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="group__array.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga1">stp_array_create</a> (int x_size, int y_size)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66">stp_array_create</a> (int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="group__array.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga2">stp_array_destroy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g562ad19d8ecc1e9bdd8c182b0a05ecec">stp_array_destroy</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="group__array.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga3">stp_array_copy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="group__array.html#g562ad19d8ecc1e9bdd8c182b0a05ecec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gab9b031be229d8762faf46a3ef9454ec">stp_array_copy</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *dest, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="group__array.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga4">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="group__array.html#gab9b031be229d8762faf46a3ef9454ec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g19370f7d4779013904be75bc3d97e024">stp_array_create_copy</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="group__array.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga5">stp_array_set_size</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="group__array.html#g19370f7d4779013904be75bc3d97e024"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g698e51815f2ef3fd0709d6b32a2bb921">stp_array_set_size</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="group__array.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga6">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="group__array.html#g698e51815f2ef3fd0709d6b32a2bb921"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g48e34b2673c2973884f0a403bafe7ea8">stp_array_get_size</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="group__array.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga7">stp_array_set_data</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="group__array.html#g48e34b2673c2973884f0a403bafe7ea8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g0ca3891b4cde193cc65de63053e3f4fa">stp_array_set_data</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="group__array.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga8">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="group__array.html#g0ca3891b4cde193cc65de63053e3f4fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be">stp_array_get_data</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="group__array.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9">stp_array_set_point</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g4ab405205d678a3d9ae02a98103fbfea">stp_array_set_point</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int x, int y, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="group__array.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga10">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="group__array.html#g4ab405205d678a3d9ae02a98103fbfea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gb9d53cf70f2c892dca82b8db2414fad2">stp_array_get_point</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="group__array.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga11">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="group__array.html#gb9d53cf70f2c892dca82b8db2414fad2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g2051c3f4a1eaccb198744f8d7c76d649">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#ga11"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="group__array.html#g2051c3f4a1eaccb198744f8d7c76d649"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Array functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/bit-ops_8h.html b/doc/gutenprint/html/bit-ops_8h.html
index 662eef3..b4bf8b5 100644
--- a/doc/gutenprint/html/bit-ops_8h.html
+++ b/doc/gutenprint/html/bit-ops_8h.html
@@ -2,36 +2,50 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/bit-ops.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>bit-ops.h File Reference</h1>Bit operations. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a0">stp_fold</a> (const unsigned char *line, int single_height, unsigned char *outbuf)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#ec711fffd61ebd40a6896d76d4c9327f">stp_fold</a> (const unsigned char *line, int single_height, unsigned char *outbuf)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a1">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#65a4f2dc6c49d8a80e1d0ca72a1f0ffd">stp_split_2</a> (int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a2">stp_split_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#24f21e067782cbb1606f4109f7acaccb">stp_split_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a3">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#9772ac792d8208e341d780fc756bf3cd">stp_unpack_2</a> (int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a4">stp_unpack_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#7fdd081b1a58cdc3648e61d23aefb744">stp_unpack_4</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a5">stp_unpack_8</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#534a4a10cda717aabaf212954cc2d891">stp_unpack_8</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#a6">stp_unpack_16</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="bit-ops_8h.html#d472146a7bdf6c1e95bcb102c4409515">stp_unpack_16</a> (int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Bit operations. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="bit-ops.h::stp_fold" ref="a0" args="(const unsigned char *line, int single_height, unsigned char *outbuf)" --><p>
+<a class="anchor" name="ec711fffd61ebd40a6896d76d4c9327f"></a><!-- doxytag: member="bit-ops.h::stp_fold" ref="ec711fffd61ebd40a6896d76d4c9327f" args="(const unsigned char *line, int single_height, unsigned char *outbuf)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -74,7 +88,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="bit-ops.h::stp_split_2" ref="a1" args="(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)" --><p>
+<a class="anchor" name="65a4f2dc6c49d8a80e1d0ca72a1f0ffd"></a><!-- doxytag: member="bit-ops.h::stp_split_2" ref="65a4f2dc6c49d8a80e1d0ca72a1f0ffd" args="(int height, int bits, const unsigned char *in, unsigned char *outhi, unsigned char *outlo)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -129,7 +143,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="bit-ops.h::stp_split_4" ref="a2" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" --><p>
+<a class="anchor" name="24f21e067782cbb1606f4109f7acaccb"></a><!-- doxytag: member="bit-ops.h::stp_split_4" ref="24f21e067782cbb1606f4109f7acaccb" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -196,7 +210,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="bit-ops.h::stp_unpack_16" ref="a6" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)" --><p>
+<a class="anchor" name="d472146a7bdf6c1e95bcb102c4409515"></a><!-- doxytag: member="bit-ops.h::stp_unpack_16" ref="d472146a7bdf6c1e95bcb102c4409515" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7, unsigned char *out8, unsigned char *out9, unsigned char *out10, unsigned char *out11, unsigned char *out12, unsigned char *out13, unsigned char *out14, unsigned char *out15)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -335,7 +349,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="bit-ops.h::stp_unpack_2" ref="a3" args="(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)" --><p>
+<a class="anchor" name="9772ac792d8208e341d780fc756bf3cd"></a><!-- doxytag: member="bit-ops.h::stp_unpack_2" ref="9772ac792d8208e341d780fc756bf3cd" args="(int height, int bits, const unsigned char *in, unsigned char *outlo, unsigned char *outhi)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -390,7 +404,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="bit-ops.h::stp_unpack_4" ref="a4" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" --><p>
+<a class="anchor" name="7fdd081b1a58cdc3648e61d23aefb744"></a><!-- doxytag: member="bit-ops.h::stp_unpack_4" ref="7fdd081b1a58cdc3648e61d23aefb744" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -457,7 +471,7 @@ Bit operations.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="bit-ops.h::stp_unpack_8" ref="a5" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)" --><p>
+<a class="anchor" name="534a4a10cda717aabaf212954cc2d891"></a><!-- doxytag: member="bit-ops.h::stp_unpack_8" ref="534a4a10cda717aabaf212954cc2d891" args="(int height, int bits, const unsigned char *in, unsigned char *out0, unsigned char *out1, unsigned char *out2, unsigned char *out3, unsigned char *out4, unsigned char *out5, unsigned char *out6, unsigned char *out7)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -548,8 +562,8 @@ Bit operations.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/channel_8h.html b/doc/gutenprint/html/channel_8h.html
index 010b48c..a13da05 100644
--- a/doc/gutenprint/html/channel_8h.html
+++ b/doc/gutenprint/html/channel_8h.html
@@ -2,70 +2,84 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/channel.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>channel.h File Reference</h1>Channel functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a0">stp_channel_reset</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#dc5c0cc7cc331da0ab394b642a381363">stp_channel_reset</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a1">stp_channel_reset_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#6a88eb8e1f968370b63326e517a34ec2">stp_channel_reset_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a2">stp_channel_add</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned channel, unsigned subchannel, double value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#6a552629f3dddf6283f605e1961dd04f">stp_channel_add</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, unsigned channel, unsigned subchannel, double value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a3">stp_channel_get_value</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#73265490d8c513de68604a982ec49e0a">stp_channel_get_value</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a4">stp_channel_set_density_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#99f818da3b4944b328de9de860d04dbc">stp_channel_set_density_adjustment</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a5">stp_channel_get_density_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#0cfa6ae42ced76291f96ff64fed6a823">stp_channel_get_density_adjustment</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a6">stp_channel_set_ink_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double limit)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#9351c3b60ed0f43e012bbd2906b0f0b4">stp_channel_set_ink_limit</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, double limit)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a7">stp_channel_get_ink_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#f6423b74581fbf34918a9e45d22186b5">stp_channel_get_ink_limit</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a8">stp_channel_set_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#4a04bbe68bd5c97d4b83cb1c1a147b48">stp_channel_set_cutoff_adjustment</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int subchannel, double adjustment)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a9">stp_channel_get_cutoff_adjustment</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#c868578c0a82a76d20160b23a9c9d603">stp_channel_get_cutoff_adjustment</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a10">stp_channel_set_black_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#6d315737ed90af4b0b9bff8c907381c3">stp_channel_set_black_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a11">stp_channel_get_black_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#00bbe8c93cbe8da9f431824dbb1dadcd">stp_channel_get_black_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a12">stp_channel_set_gloss_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#38a09aeef9c53c039fa7d1124921a7c9">stp_channel_set_gloss_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a13">stp_channel_get_gloss_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a907ffda300039a00ae7ddb333038480">stp_channel_get_gloss_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a14">stp_channel_set_gloss_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double limit)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#4349853a306208c7d98074a585991ef0">stp_channel_set_gloss_limit</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, double limit)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a15">stp_channel_get_gloss_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#e1702ed4a233cadce00e9bc87fd5ca45">stp_channel_get_gloss_limit</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a16">stp_channel_set_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#42d1438e758951e81ff49fbf81e73d2b">stp_channel_set_curve</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int channel, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a17">stp_channel_get_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int channel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#619228b113312c73cdce75b15bb88313">stp_channel_get_curve</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int channel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a18">stp_channel_set_gcr_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#2ce95b47a5f1a6c146588e0fb49db2e4">stp_channel_set_gcr_curve</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a19">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#0f1e6073d53036f6771a0cc69cf9e261">stp_channel_get_gcr_curve</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a20">stp_channel_initialize</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#00b63c73990babb75e5896ffd7022634">stp_channel_initialize</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int input_channel_count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a21">stp_channel_convert</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#cef9de964c7569983e1ff1d0550d3bd6">stp_channel_convert</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a22">stp_channel_get_input</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#f5ef85fbc689b2f94c0be23c0b8b3765">stp_channel_get_input</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#a23">stp_channel_get_output</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="channel_8h.html#9c4df56f4ad83b6232cf6ec17b6dc031">stp_channel_get_output</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Channel functions. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a2"></a><!-- doxytag: member="channel.h::stp_channel_add" ref="a2" args="(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)" --><p>
+<a class="anchor" name="6a552629f3dddf6283f605e1961dd04f"></a><!-- doxytag: member="channel.h::stp_channel_add" ref="6a552629f3dddf6283f605e1961dd04f" args="(stp_vars_t *v, unsigned channel, unsigned subchannel, double value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -73,7 +87,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_add           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -114,7 +128,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="channel.h::stp_channel_convert" ref="a21" args="(const stp_vars_t *v, unsigned *zero_mask)" --><p>
+<a class="anchor" name="cef9de964c7569983e1ff1d0550d3bd6"></a><!-- doxytag: member="channel.h::stp_channel_convert" ref="cef9de964c7569983e1ff1d0550d3bd6" args="(const stp_vars_t *v, unsigned *zero_mask)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -122,7 +136,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_convert           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -151,7 +165,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="a11" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="00bbe8c93cbe8da9f431824dbb1dadcd"></a><!-- doxytag: member="channel.h::stp_channel_get_black_channel" ref="00bbe8c93cbe8da9f431824dbb1dadcd" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -159,7 +173,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">int stp_channel_get_black_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -179,15 +193,15 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="a17" args="(stp_vars_t *v, int channel)" --><p>
+<a class="anchor" name="619228b113312c73cdce75b15bb88313"></a><!-- doxytag: member="channel.h::stp_channel_get_curve" ref="619228b113312c73cdce75b15bb88313" args="(stp_vars_t *v, int channel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_channel_get_curve           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_channel_get_curve           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -216,7 +230,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="channel.h::stp_channel_get_cutoff_adjustment" ref="a9" args="(stp_vars_t *v, int color, int subchannel)" --><p>
+<a class="anchor" name="c868578c0a82a76d20160b23a9c9d603"></a><!-- doxytag: member="channel.h::stp_channel_get_cutoff_adjustment" ref="c868578c0a82a76d20160b23a9c9d603" args="(stp_vars_t *v, int color, int subchannel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -224,7 +238,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">double stp_channel_get_cutoff_adjustment           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -259,7 +273,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="channel.h::stp_channel_get_density_adjustment" ref="a5" args="(stp_vars_t *v, int color, int subchannel)" --><p>
+<a class="anchor" name="0cfa6ae42ced76291f96ff64fed6a823"></a><!-- doxytag: member="channel.h::stp_channel_get_density_adjustment" ref="0cfa6ae42ced76291f96ff64fed6a823" args="(stp_vars_t *v, int color, int subchannel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -267,7 +281,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">double stp_channel_get_density_adjustment           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -302,15 +316,15 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="a19" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="0f1e6073d53036f6771a0cc69cf9e261"></a><!-- doxytag: member="channel.h::stp_channel_get_gcr_curve" ref="0f1e6073d53036f6771a0cc69cf9e261" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_channel_get_gcr_curve           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_channel_get_gcr_curve           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -330,7 +344,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="a13" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="a907ffda300039a00ae7ddb333038480"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_channel" ref="a907ffda300039a00ae7ddb333038480" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -338,7 +352,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">int stp_channel_get_gloss_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -358,7 +372,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="a15" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="e1702ed4a233cadce00e9bc87fd5ca45"></a><!-- doxytag: member="channel.h::stp_channel_get_gloss_limit" ref="e1702ed4a233cadce00e9bc87fd5ca45" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -366,7 +380,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">double stp_channel_get_gloss_limit           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -386,7 +400,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="a7" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="f6423b74581fbf34918a9e45d22186b5"></a><!-- doxytag: member="channel.h::stp_channel_get_ink_limit" ref="f6423b74581fbf34918a9e45d22186b5" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -394,7 +408,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">double stp_channel_get_ink_limit           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -414,7 +428,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="a22" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="f5ef85fbc689b2f94c0be23c0b8b3765"></a><!-- doxytag: member="channel.h::stp_channel_get_input" ref="f5ef85fbc689b2f94c0be23c0b8b3765" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -422,7 +436,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">unsigned short* stp_channel_get_input           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -442,7 +456,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="a23" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="9c4df56f4ad83b6232cf6ec17b6dc031"></a><!-- doxytag: member="channel.h::stp_channel_get_output" ref="9c4df56f4ad83b6232cf6ec17b6dc031" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -450,7 +464,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">unsigned short* stp_channel_get_output           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -470,7 +484,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="channel.h::stp_channel_get_value" ref="a3" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" --><p>
+<a class="anchor" name="73265490d8c513de68604a982ec49e0a"></a><!-- doxytag: member="channel.h::stp_channel_get_value" ref="73265490d8c513de68604a982ec49e0a" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -478,7 +492,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">double stp_channel_get_value           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -513,7 +527,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="channel.h::stp_channel_initialize" ref="a20" args="(stp_vars_t *v, stp_image_t *image, int input_channel_count)" --><p>
+<a class="anchor" name="00b63c73990babb75e5896ffd7022634"></a><!-- doxytag: member="channel.h::stp_channel_initialize" ref="00b63c73990babb75e5896ffd7022634" args="(stp_vars_t *v, stp_image_t *image, int input_channel_count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -521,7 +535,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_initialize           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -556,7 +570,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="a0" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="dc5c0cc7cc331da0ab394b642a381363"></a><!-- doxytag: member="channel.h::stp_channel_reset" ref="dc5c0cc7cc331da0ab394b642a381363" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -564,7 +578,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_reset           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -584,7 +598,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="a1" args="(stp_vars_t *v, int channel)" --><p>
+<a class="anchor" name="6a88eb8e1f968370b63326e517a34ec2"></a><!-- doxytag: member="channel.h::stp_channel_reset_channel" ref="6a88eb8e1f968370b63326e517a34ec2" args="(stp_vars_t *v, int channel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -592,7 +606,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_reset_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -621,7 +635,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="channel.h::stp_channel_set_black_channel" ref="a10" args="(stp_vars_t *v, int channel)" --><p>
+<a class="anchor" name="6d315737ed90af4b0b9bff8c907381c3"></a><!-- doxytag: member="channel.h::stp_channel_set_black_channel" ref="6d315737ed90af4b0b9bff8c907381c3" args="(stp_vars_t *v, int channel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -629,7 +643,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_black_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -658,7 +672,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="channel.h::stp_channel_set_curve" ref="a16" args="(stp_vars_t *v, int channel, const stp_curve_t *curve)" --><p>
+<a class="anchor" name="42d1438e758951e81ff49fbf81e73d2b"></a><!-- doxytag: member="channel.h::stp_channel_set_curve" ref="42d1438e758951e81ff49fbf81e73d2b" args="(stp_vars_t *v, int channel, const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -666,7 +680,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_curve           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -678,7 +692,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -701,7 +715,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="channel.h::stp_channel_set_cutoff_adjustment" ref="a8" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" --><p>
+<a class="anchor" name="4a04bbe68bd5c97d4b83cb1c1a147b48"></a><!-- doxytag: member="channel.h::stp_channel_set_cutoff_adjustment" ref="4a04bbe68bd5c97d4b83cb1c1a147b48" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -709,7 +723,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_cutoff_adjustment           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -750,7 +764,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="channel.h::stp_channel_set_density_adjustment" ref="a4" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" --><p>
+<a class="anchor" name="99f818da3b4944b328de9de860d04dbc"></a><!-- doxytag: member="channel.h::stp_channel_set_density_adjustment" ref="99f818da3b4944b328de9de860d04dbc" args="(stp_vars_t *v, int color, int subchannel, double adjustment)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -758,7 +772,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_density_adjustment           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -799,7 +813,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="channel.h::stp_channel_set_gcr_curve" ref="a18" args="(stp_vars_t *v, const stp_curve_t *curve)" --><p>
+<a class="anchor" name="2ce95b47a5f1a6c146588e0fb49db2e4"></a><!-- doxytag: member="channel.h::stp_channel_set_gcr_curve" ref="2ce95b47a5f1a6c146588e0fb49db2e4" args="(stp_vars_t *v, const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -807,13 +821,13 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_gcr_curve           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -836,7 +850,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_channel" ref="a12" args="(stp_vars_t *v, int channel)" --><p>
+<a class="anchor" name="38a09aeef9c53c039fa7d1124921a7c9"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_channel" ref="38a09aeef9c53c039fa7d1124921a7c9" args="(stp_vars_t *v, int channel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -844,7 +858,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_gloss_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -873,7 +887,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_limit" ref="a14" args="(stp_vars_t *v, double limit)" --><p>
+<a class="anchor" name="4349853a306208c7d98074a585991ef0"></a><!-- doxytag: member="channel.h::stp_channel_set_gloss_limit" ref="4349853a306208c7d98074a585991ef0" args="(stp_vars_t *v, double limit)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -881,7 +895,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_gloss_limit           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -910,7 +924,7 @@ Channel functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="channel.h::stp_channel_set_ink_limit" ref="a6" args="(stp_vars_t *v, double limit)" --><p>
+<a class="anchor" name="9351c3b60ed0f43e012bbd2906b0f0b4"></a><!-- doxytag: member="channel.h::stp_channel_set_ink_limit" ref="9351c3b60ed0f43e012bbd2906b0f0b4" args="(stp_vars_t *v, double limit)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -918,7 +932,7 @@ Channel functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_channel_set_ink_limit           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -947,8 +961,8 @@ Channel functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/classes.html b/doc/gutenprint/html/classes.html
index a4dab63..7693064 100644
--- a/doc/gutenprint/html/classes.html
+++ b/doc/gutenprint/html/classes.html
@@ -2,16 +2,31 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Alphabetical List</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindexHL" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
 <tr><td><a name="letter_D"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;D&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
 </td><td><a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__pass__t.html">stp_pass_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__color.html">stp_color</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__raw__t.html">stp_raw_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__family.html">stp_family</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__image.html">stp_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__module.html">stp_module</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__papersize__t.html">stp_papersize_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstp__weave__t.html">stp_weave_t</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_D">D</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/color_8h.html b/doc/gutenprint/html/color_8h.html
index 31b5dcd..31f7f3b 100644
--- a/doc/gutenprint/html/color_8h.html
+++ b/doc/gutenprint/html/color_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/color.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>color.h File Reference</h1>Color functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -17,44 +31,44 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gb711e2534c69bde47be7af3409c8ee2c">stp_color_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga6">stp_color_init</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g835bd7024477347a46ea0c14b46996c6">stp_color_init</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga7">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gadf861820b3956ef7b18600dbf5da9da">stp_color_get_row</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga8">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ge2e397268288111eaffd352cb0ff1b98">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga9">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gc47fecc2c32115494ea364e53d9f1ff2">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga10">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ge3543409e331c5d1756c2c8fe927343b">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga11">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3e0f2728d47e1701c00b06199bc5512d">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga12">stp_color_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga8b8b19da7bcc9bc814fe0f97f39b3ed">stp_color_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga13">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="group__color.html#ga8b8b19da7bcc9bc814fe0f97f39b3ed"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g25d9ee3ceee6d6e9964007ad12f9900b">stp_get_color_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga14">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="group__color.html#g25d9ee3ceee6d6e9964007ad12f9900b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5ddc4c9d02576154d0b2c6c64a6a033">stp_get_color_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga15">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="group__color.html#ga5ddc4c9d02576154d0b2c6c64a6a033"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga92373d7aa315ab6e32a1bb0ac944b79">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga16">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g36d2d72d2cd967405a978b76a7a8c992">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga17">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="group__color.html#g36d2d72d2cd967405a978b76a7a8c992"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0559d7812bdcbebe4edc14fc05274d9">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#ga17"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="group__color.html#ga0559d7812bdcbebe4edc14fc05274d9"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Color functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve-cache_8h.html b/doc/gutenprint/html/curve-cache_8h.html
index 6950ab9..398c681 100644
--- a/doc/gutenprint/html/curve-cache_8h.html
+++ b/doc/gutenprint/html/curve-cache_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/curve-cache.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>curve-cache.h File Reference</h1>Curve caching functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
@@ -16,39 +30,39 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a0">CURVE_CACHE_FAST_USHORT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#c0763605d9b80d9889407dd340e357fd">CURVE_CACHE_FAST_USHORT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;s_cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a1">CURVE_CACHE_FAST_DOUBLE</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#b434b6a3a8ce63d95d11b2bce6360536">CURVE_CACHE_FAST_DOUBLE</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;d_cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a2">CURVE_CACHE_FAST_COUNT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#b8c3f0a2734a4bdb08989cc62761e8e7">CURVE_CACHE_FAST_COUNT</a>(cache)&nbsp;&nbsp;&nbsp;((cache)-&gt;count)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a3">stp_curve_free_curve_cache</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#3cef707d88b48136a52f733f80ae52dd">stp_curve_free_curve_cache</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a4">stp_curve_cache_curve_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#5cb281dd07eecda913b168451b2d615b">stp_curve_cache_curve_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a5">stp_curve_cache_get_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#256ae4356b6205ba61fbc6b5e90c1762">stp_curve_cache_get_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a6">stp_curve_cache_curve_invalidate</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#7966337362f5e8fc0ed54edd8da645a2">stp_curve_cache_curve_invalidate</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a7">stp_curve_cache_set_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#f775dcfafb717b24ff655cc801c14dfc">stp_curve_cache_set_curve</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a8">stp_curve_cache_set_curve_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#33011bde2e051e0b222177b0db746da9">stp_curve_cache_set_curve_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a9">stp_curve_cache_get_count</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#723301540e82db80f8ce9100ec832876">stp_curve_cache_get_count</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a10">stp_curve_cache_get_ushort_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#6a318767b044ac996ae318771f715a01">stp_curve_cache_get_ushort_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a11">stp_curve_cache_get_double_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#83788e3f9d421bdab139d92127a7e5e3">stp_curve_cache_get_double_data</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *cache)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#a12">stp_curve_cache_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *dest, const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *src)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve-cache_8h.html#6a8addcc359b8cfbc2fa5c8cec97643d">stp_curve_cache_copy</a> (<a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *dest, const <a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *src)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Curve caching functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a2"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="a2" args="(cache)" --><p>
+<a class="anchor" name="b8c3f0a2734a4bdb08989cc62761e8e7"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_COUNT" ref="b8c3f0a2734a4bdb08989cc62761e8e7" args="(cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -76,7 +90,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_DOUBLE" ref="a1" args="(cache)" --><p>
+<a class="anchor" name="b434b6a3a8ce63d95d11b2bce6360536"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_DOUBLE" ref="b434b6a3a8ce63d95d11b2bce6360536" args="(cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -104,7 +118,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_USHORT" ref="a0" args="(cache)" --><p>
+<a class="anchor" name="c0763605d9b80d9889407dd340e357fd"></a><!-- doxytag: member="curve-cache.h::CURVE_CACHE_FAST_USHORT" ref="c0763605d9b80d9889407dd340e357fd" args="(cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -133,7 +147,7 @@ Curve caching functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a12"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_copy" ref="a12" args="(stp_cached_curve_t *dest, const stp_cached_curve_t *src)" --><p>
+<a class="anchor" name="6a8addcc359b8cfbc2fa5c8cec97643d"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_copy" ref="6a8addcc359b8cfbc2fa5c8cec97643d" args="(stp_cached_curve_t *dest, const stp_cached_curve_t *src)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -170,7 +184,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_data" ref="a4" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="5cb281dd07eecda913b168451b2d615b"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_data" ref="5cb281dd07eecda913b168451b2d615b" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -198,7 +212,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_invalidate" ref="a6" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="7966337362f5e8fc0ed54edd8da645a2"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_curve_invalidate" ref="7966337362f5e8fc0ed54edd8da645a2" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -226,13 +240,13 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_count" ref="a9" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="723301540e82db80f8ce9100ec832876"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_count" ref="723301540e82db80f8ce9100ec832876" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const size_t stp_curve_cache_get_count           </td>
+          <td class="md" nowrap valign="top">size_t stp_curve_cache_get_count           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
@@ -254,13 +268,13 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_curve" ref="a5" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="256ae4356b6205ba61fbc6b5e90c1762"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_curve" ref="256ae4356b6205ba61fbc6b5e90c1762" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_cache_get_curve           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_cache_get_curve           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__cached__curve__t.html">stp_cached_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>cache</em>          </td>
@@ -282,7 +296,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_double_data" ref="a11" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="83788e3f9d421bdab139d92127a7e5e3"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_double_data" ref="83788e3f9d421bdab139d92127a7e5e3" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -310,7 +324,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_ushort_data" ref="a10" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="6a318767b044ac996ae318771f715a01"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_get_ushort_data" ref="6a318767b044ac996ae318771f715a01" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -338,7 +352,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve" ref="a7" args="(stp_cached_curve_t *cache, stp_curve_t *curve)" --><p>
+<a class="anchor" name="f775dcfafb717b24ff655cc801c14dfc"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve" ref="f775dcfafb717b24ff655cc801c14dfc" args="(stp_cached_curve_t *cache, stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -352,7 +366,7 @@ Curve caching functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -375,7 +389,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve_copy" ref="a8" args="(stp_cached_curve_t *cache, const stp_curve_t *curve)" --><p>
+<a class="anchor" name="33011bde2e051e0b222177b0db746da9"></a><!-- doxytag: member="curve-cache.h::stp_curve_cache_set_curve_copy" ref="33011bde2e051e0b222177b0db746da9" args="(stp_cached_curve_t *cache, const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -389,7 +403,7 @@ Curve caching functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -412,7 +426,7 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="curve-cache.h::stp_curve_free_curve_cache" ref="a3" args="(stp_cached_curve_t *cache)" --><p>
+<a class="anchor" name="3cef707d88b48136a52f733f80ae52dd"></a><!-- doxytag: member="curve-cache.h::stp_curve_free_curve_cache" ref="3cef707d88b48136a52f733f80ae52dd" args="(stp_cached_curve_t *cache)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -440,8 +454,8 @@ Curve caching functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/curve_8h.html b/doc/gutenprint/html/curve_8h.html
index e8c8bb1..fa3d9b5 100644
--- a/doc/gutenprint/html/curve_8h.html
+++ b/doc/gutenprint/html/curve_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/curve.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>curve.h File Reference</h1>Curve functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;stdio.h&gt;</code><br>
@@ -19,175 +33,175 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0">stp_curve_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="group__curve.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga47a1">STP_CURVE_TYPE_LINEAR</a>, 
-<a class="el" href="group__curve.html#gga47a2">STP_CURVE_TYPE_SPLINE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff">STP_CURVE_TYPE_LINEAR</a>, 
+<a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4">STP_CURVE_TYPE_SPLINE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga47">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga48a3">STP_CURVE_WRAP_NONE</a>, 
-<a class="el" href="group__curve.html#gga48a4">STP_CURVE_WRAP_AROUND</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85">STP_CURVE_WRAP_NONE</a>, 
+<a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2">STP_CURVE_WRAP_AROUND</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga48">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga49a5">STP_CURVE_COMPOSE_ADD</a>, 
-<a class="el" href="group__curve.html#gga49a6">STP_CURVE_COMPOSE_MULTIPLY</a>, 
-<a class="el" href="group__curve.html#gga49a7">STP_CURVE_COMPOSE_EXPONENTIATE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#g1880ff988f772337e8892e791951337b">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d">STP_CURVE_COMPOSE_ADD</a>, 
+<a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011">STP_CURVE_COMPOSE_MULTIPLY</a>, 
+<a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701">STP_CURVE_COMPOSE_EXPONENTIATE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga49">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga50a8">STP_CURVE_BOUNDS_RESCALE</a>, 
-<a class="el" href="group__curve.html#gga50a9">STP_CURVE_BOUNDS_CLIP</a>, 
-<a class="el" href="group__curve.html#gga50a10">STP_CURVE_BOUNDS_ERROR</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09">STP_CURVE_BOUNDS_RESCALE</a>, 
+<a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41">STP_CURVE_BOUNDS_CLIP</a>, 
+<a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a">STP_CURVE_BOUNDS_ERROR</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga50">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#gd2b61113497bb142943d5131df3286ae">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga1">stp_curve_create</a> (<a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> wrap)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6">stp_curve_create</a> (<a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a> wrap)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="group__curve.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ge76787e84f2fc3ba299de94f4ecc6d82">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="group__curve.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="group__curve.html#ge76787e84f2fc3ba299de94f4ecc6d82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gfdafb0a802f00063b00713dbd6d6bfc0">stp_curve_copy</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="group__curve.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="group__curve.html#gfdafb0a802f00063b00713dbd6d6bfc0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g01bf94ed6a523f28dd909be054a69790">stp_curve_destroy</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="group__curve.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="group__curve.html#g01bf94ed6a523f28dd909be054a69790"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g5283a18fcc5db8e9f9384d54de50ba83">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="group__curve.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="group__curve.html#g5283a18fcc5db8e9f9384d54de50ba83"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g4d32e3000dd3a8f258b2eab94797731b">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="group__curve.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="group__curve.html#g4d32e3000dd3a8f258b2eab94797731b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd2aade6a22b516006ce0f897c5027f35">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="group__curve.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="group__curve.html#gd2aade6a22b516006ce0f897c5027f35"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gdda4313c874170e0086d2000ed04c02f">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="group__curve.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga9">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="group__curve.html#gdda4313c874170e0086d2000ed04c02f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf8bad025ea7463067c9d7ab205af062">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga10">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g48d9023f28ae2d15975002f7a9d7f94e">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="group__curve.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga11">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> itype)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="group__curve.html#g48d9023f28ae2d15975002f7a9d7f94e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3175711d943e95fdf363d5124237a56e">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a> itype)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="group__curve.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga12">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="group__curve.html#g3175711d943e95fdf363d5124237a56e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gca245aa6907c2fb95e150ce9a86ddb1a">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="group__curve.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga13">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="group__curve.html#gca245aa6907c2fb95e150ce9a86ddb1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gba540befdbd82e705358b2175d5b92e8">stp_curve_set_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga14">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#gba540befdbd82e705358b2175d5b92e8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcbd01a2662edb48af0816930b40dc8ab">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga15">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="group__curve.html#gcbd01a2662edb48af0816930b40dc8ab"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gc0401bfefa3990ca26a0fb7718f1ebb2">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="group__curve.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga16">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="group__curve.html#gc0401bfefa3990ca26a0fb7718f1ebb2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf770dcae26ce48d5ee50dd8217e2c14">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="group__curve.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga17">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="group__curve.html#gaf770dcae26ce48d5ee50dd8217e2c14"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g184e0e32892aae4b2c195c6fc880bace">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="group__curve.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga18">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="group__curve.html#g184e0e32892aae4b2c195c6fc880bace"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gbc9ae004e972c7d638336714f3112f9b">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="group__curve.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="group__curve.html#gbc9ae004e972c7d638336714f3112f9b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g8a215d4981a74fb2b6e4a0c381314df0">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="group__curve.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga20">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="group__curve.html#g8a215d4981a74fb2b6e4a0c381314df0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd23dcc9abefca9a98b3ecd9714227093">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="group__curve.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga21">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="group__curve.html#gd23dcc9abefca9a98b3ecd9714227093"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g4051de3e6be42f4499de78af67288616">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="group__curve.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga22">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="group__curve.html#g4051de3e6be42f4499de78af67288616"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd4cfbfbfe0c16b8f2ef4d8c44d221172">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="group__curve.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga23">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *range, size_t start)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="group__curve.html#gd4cfbfbfe0c16b8f2ef4d8c44d221172"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0ba6753a8beeaca19719d047da25ecb5">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *range, size_t start)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g24b9486c45d68983e94dcc0fb19edacd">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="group__curve.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga25">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="group__curve.html#g24b9486c45d68983e94dcc0fb19edacd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd30e41654f1e0217aae3389b30cdffba">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="group__curve.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga26">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="group__curve.html#gd30e41654f1e0217aae3389b30cdffba"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf363a0f9686bcd6521671d531bc522d5">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="group__curve.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga27">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="group__curve.html#gf363a0f9686bcd6521671d531bc522d5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g187af251d5a89853545c8be898a00cc1">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="group__curve.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga28">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="group__curve.html#g187af251d5a89853545c8be898a00cc1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3ecbc0ce98e7bd7695002306f5a2ba1b">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="group__curve.html#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="group__curve.html#g3ecbc0ce98e7bd7695002306f5a2ba1b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g01bda0b947a6075d4a1ed373865744e6">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="group__curve.html#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga30">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="group__curve.html#g01bda0b947a6075d4a1ed373865744e6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb874365285383f3eb35c1a32496a69b4">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="group__curve.html#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="group__curve.html#gb874365285383f3eb35c1a32496a69b4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g60767bb2143fe4d491d351a4c0abc3b1">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="group__curve.html#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga32">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="group__curve.html#g60767bb2143fe4d491d351a4c0abc3b1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb2312169172ec9789af9fd38279b3273">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="group__curve.html#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga33">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="group__curve.html#gb2312169172ec9789af9fd38279b3273"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gee3cc69ab758b400838014df4742c28e">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="group__curve.html#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga34">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double f_gamma)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="group__curve.html#gee3cc69ab758b400838014df4742c28e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6548b7ca6ef6ab94fe1d927c246e7baf">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double f_gamma)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="group__curve.html#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga35">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="group__curve.html#g6548b7ca6ef6ab94fe1d927c246e7baf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gc9786b35c2b1a55d54b62bcc57481c82">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="group__curve.html#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga36">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="group__curve.html#gc9786b35c2b1a55d54b62bcc57481c82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g9a05eae4f274f420418539cceb627556">stp_curve_set_point</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="group__curve.html#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga37">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="group__curve.html#g9a05eae4f274f420418539cceb627556"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf9ff6f55ec0a0615608dc1baec6aff00">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="group__curve.html#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga38">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double where, double *result)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="group__curve.html#gf9ff6f55ec0a0615608dc1baec6aff00"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0fdfc2b27a8a464584589ef38a8e05c4">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double where, double *result)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="group__curve.html#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga39">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="group__curve.html#g0fdfc2b27a8a464584589ef38a8e05c4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf68cf2508ff4a14a0dbee6fc0001667e">stp_curve_resample</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="group__curve.html#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga40">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> bounds_mode)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="group__curve.html#gf68cf2508ff4a14a0dbee6fc0001667e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd440d8d448173adc2be6737963a6e999">stp_curve_rescale</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a> bounds_mode)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="group__curve.html#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga41">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="group__curve.html#gd440d8d448173adc2be6737963a6e999"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6ef71ce7d92e659b1c902df29b1dcbc7">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="group__curve.html#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="group__curve.html#g6ef71ce7d92e659b1c902df29b1dcbc7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g21aa4497c58ebbb703dc3549560f084d">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="group__curve.html#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga43">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="group__curve.html#g21aa4497c58ebbb703dc3549560f084d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g650e49e1250dab5d9221ad747a627fc0">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga44">stp_curve_create_from_file</a> (const char *file)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#g650e49e1250dab5d9221ad747a627fc0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6ff03fcc2a47f297c48b683884e81924">stp_curve_create_from_file</a> (const char *file)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga45">stp_curve_create_from_string</a> (const char *string)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="group__curve.html#g6ff03fcc2a47f297c48b683884e81924"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g60dce8c741a9b6fde73ced2134305298">stp_curve_create_from_string</a> (const char *string)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="group__curve.html#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga46">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, int points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="group__curve.html#g60dce8c741a9b6fde73ced2134305298"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g657e0ad5b93f090220d35be615fec5e4">stp_curve_compose</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *a, <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *b, <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> mode, int points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#ga46"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="group__curve.html#g657e0ad5b93f090220d35be615fec5e4"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Curve functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/deprecated.html b/doc/gutenprint/html/deprecated.html
index 2931c33..66b9d67 100644
--- a/doc/gutenprint/html/deprecated.html
+++ b/doc/gutenprint/html/deprecated.html
@@ -2,20 +2,41 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Deprecated List</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1><a class="anchor" name="deprecated">Deprecated List</a></h1><a class="anchor" name="_deprecated000001"></a> <dl>
-<dt>Global <a class="el" href="group__printer.html#ga7">stp_get_printer_index_by_driver</a>  </dt>
-<dd>There should never be any need to use this function.</dd>
+<dt>Global <a class="el" href="group__printer.html#g6f32b0213b580bf081fc8752a3eb04a1">stp_get_printer_index_by_driver</a>  </dt>
+<dd>There should never be any need to use this function. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>driver</em>&nbsp;</td><td>the printer model's short (driver) name. </td></tr>
+  </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure. </dd></dl>
+</dd>
 </dl>
 <p>
 <a class="anchor" name="_deprecated000002"></a> <dl>
-<dt>Global <a class="el" href="group__vars.html#ga37">stp_merge_printvars</a>  </dt>
-<dd>This is likely to go away.</dd>
+<dt>Global <a class="el" href="group__vars.html#gc970fc314c6418d9193d93c787b908d9">stp_merge_printvars</a>  </dt>
+<dd>This is likely to go away. <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>user</em>&nbsp;</td><td>the destination vars. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>print</em>&nbsp;</td><td>the vars to merge into user. </td></tr>
+  </table>
+</dl>
+</dd>
 </dl>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dir_000000.html b/doc/gutenprint/html/dir_000000.html
deleted file mode 100644
index 071f7f1..0000000
--- a/doc/gutenprint/html/dir_000000.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>libgutenprint API Reference: include/ Directory Reference</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="nav">
-<a class="el" href="dir_000000.html">include</a></div>
-<h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
-<tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Directories</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprint</a></td></tr>
-
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
-<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
-</body>
-</html>
diff --git a/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html b/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html
new file mode 100644
index 0000000..922c642
--- /dev/null
+++ b/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>libgutenprint API Reference: include/ Directory Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="nav">
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a></div>
+<h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
+<tr><td></td></tr>
+<tr><td colspan="2"><br><h2>Directories</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></td></tr>
+
+</table>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/dir_000001.html b/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html
index 89aa082..94a415b 100644
--- a/doc/gutenprint/html/dir_000001.html
+++ b/doc/gutenprint/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html
@@ -2,11 +2,20 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/ Directory Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>gutenprint Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Files</h2></td></tr>
@@ -136,8 +145,8 @@
 
 <p>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dirs.html b/doc/gutenprint/html/dirs.html
index ca3458e..f9a3cfd 100644
--- a/doc/gutenprint/html/dirs.html
+++ b/doc/gutenprint/html/dirs.html
@@ -2,17 +2,26 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Directory Hierarchy</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindexHL" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li id="current"><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir_000000.html">include</a>
+<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>
 <ul>
-<li><a class="el" href="dir_000001.html">gutenprint</a>
+<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a>
 </ul>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/dither_8h.html b/doc/gutenprint/html/dither_8h.html
index 78f05ce..5c7dce3 100644
--- a/doc/gutenprint/html/dither_8h.html
+++ b/doc/gutenprint/html/dither_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/dither.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>dither.h File Reference</h1>Dither functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -25,98 +39,98 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html">stp_shade</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a0">STP_ECOLOR_K</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#4faa7aec0dc7471ed5a7d1622991ac77">STP_ECOLOR_K</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a1">STP_ECOLOR_C</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#575ca9b45d518b92177323e70295198a">STP_ECOLOR_C</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a2">STP_ECOLOR_M</a>&nbsp;&nbsp;&nbsp;2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#c7f1f45ff56dfbaff0a36599c6bf822c">STP_ECOLOR_M</a>&nbsp;&nbsp;&nbsp;2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a3">STP_ECOLOR_Y</a>&nbsp;&nbsp;&nbsp;3</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#e1492502d48a830e5dda11f1d7afb494">STP_ECOLOR_Y</a>&nbsp;&nbsp;&nbsp;3</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a4">STP_NCOLORS</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#3e02bef38f178e66a4439df6ec61c503">STP_NCOLORS</a>&nbsp;&nbsp;&nbsp;(4)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a5">stp_dither_matrix_short_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__short.html">stp_dither_matrix_short</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#373f2efaf250ca412b5447b8bd4e7f51">stp_dither_matrix_short_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a6">stp_dither_matrix_normal_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__normal.html">stp_dither_matrix_normal</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a7bbfbb8dd05a8c05a5c37143adc129a">stp_dither_matrix_normal_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a7">stp_dither_matrix_generic_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#c81f99c36dbc48c619831897bac28224">stp_dither_matrix_generic_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a8">stp_dither_matrix_impl_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structdither__matrix__impl.html">dither_matrix_impl</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#613c628e788dbef089fa32243500cd54">stp_dither_matrix_impl_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9">stp_dotsize_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__dotsize.html">stp_dotsize</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#0a4617ed6063c68c6c8675fb9e8e9d01">stp_dotsize_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a10">stp_shade_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__shade.html">stp_shade</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#737b4edb8992127d0616e78f6c0a4c14">stp_shade_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a11">stp_dither_matrix_iterated_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#e79d2866600d79be412b660f036995f4">stp_dither_matrix_iterated_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, size_t size, size_t exponent, const unsigned *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a12">stp_dither_matrix_shear</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#1c29e4d285f27f7fd300643f7023f305">stp_dither_matrix_shear</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a13">stp_dither_matrix_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#8346fdae0bfb7422f52c0a2eec3abd87">stp_dither_matrix_init</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a14">stp_dither_matrix_init_short</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#6a7a7142c53dd1cd70b3f7fb481e5564">stp_dither_matrix_init_short</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a15">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#05677f96e6de536ecf91a65ee0715998">stp_dither_matrix_validate_array</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a16">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a9efd9cefabdab92a8ce5fbf7aca8876">stp_dither_matrix_init_from_dither_array</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int transpose)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a17">stp_dither_matrix_destroy</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#361cf36b4875e8ef2c8152f66d4a9284">stp_dither_matrix_destroy</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a18">stp_dither_matrix_clone</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#aaa6d937beb5f9bef6e7ec34fc776d54">stp_dither_matrix_clone</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest, int x_offset, int y_offset)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a19">stp_dither_matrix_copy</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#289ae89081129060bf67371d7ce9fcef">stp_dither_matrix_copy</a> (const <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *src, <a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *dest)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a20">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#0d1f33cd934e13ed0b0f859d131efbc1">stp_dither_matrix_scale_exponentially</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, double exponent)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a21">stp_dither_matrix_set_row</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#c329929a25c54355a7ed23f23616ced5">stp_dither_matrix_set_row</a> (<a class="el" href="structdither__matrix__impl.html">stp_dither_matrix_impl_t</a> *mat, int y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a22">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ef8ca9aa08ab848746e370100a4b20e2">stp_find_standard_dither_array</a> (int x_aspect, int y_aspect)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a23">stp_dither_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#9ad687cfc22956dd88495ae0a831c1b6">stp_dither_list_parameters</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a24">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#6daf654828bc5235bc785fceb8aebb89">stp_dither_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a25">stp_dither_init</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#6d409bf6395231621a725a45fac8bb8e">stp_dither_init</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int out_width, int xdpi, int ydpi)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a26">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#85eb5568b8a8036271e50794519c08e2">stp_dither_set_iterated_matrix</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a27">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#25b3d76810fd0dcb0928edff37060409">stp_dither_set_matrix</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const <a class="el" href="structstp__dither__matrix__generic.html">stp_dither_matrix_generic_t</a> *mat, int transpose, int x_shear, int y_shear)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a28">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int transpose)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ae5be944ec353d075ea17c32370270bd">stp_dither_set_matrix_from_dither_array</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int transpose)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a29">stp_dither_set_transition</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#d7cd0b4e7bf474516b14d0a186b23b96">stp_dither_set_transition</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, double)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a30">stp_dither_set_randomizer</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, double)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#6d8fc8a344a764f92ee43ff8b959aace">stp_dither_set_randomizer</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, double)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a31">stp_dither_set_ink_spread</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int spread)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#744fa9a5d204da486f07a8f1b21c9ba3">stp_dither_set_ink_spread</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int spread)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a32">stp_dither_set_adaptive_limit</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, double limit)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#d261306c74a8affdf11ad2cc519e8bba">stp_dither_set_adaptive_limit</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, double limit)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a33">stp_dither_get_first_position</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchan)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#f113ac1043230813204db189e3fd84a8">stp_dither_get_first_position</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int subchan)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a34">stp_dither_get_last_position</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int subchan)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#e13f1c62835c48c5fb58b45c8ed35f32">stp_dither_get_last_position</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int subchan)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a35">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#ffc1834e675956e79ae5a866895db39c">stp_dither_set_inks_simple</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int nlevels, const double *levels, double density, double darkness)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a36">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#0aae5a947e8953323b097fbb79c93c68">stp_dither_set_inks_full</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, int nshades, const <a class="el" href="structstp__shade.html">stp_shade_t</a> *shades, double density, double darkness)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a37">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#fd1d75ef5cfb0e013601a4e084352786">stp_dither_set_inks</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a38">stp_dither_add_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned char *data, unsigned channel, unsigned subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#28bb47c7e1436e2c4af3b0be87b5d1c6">stp_dither_add_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, unsigned char *data, unsigned channel, unsigned subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a39">stp_dither_get_channel</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#94da054fb7a3f42cf4c2937f4d37e528">stp_dither_get_channel</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, unsigned channel, unsigned subchannel)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a40">stp_dither</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a22b0e4fe00acaf11ce611e29f1b1ba3">stp_dither</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#a41">stp_dither_internal</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dither_8h.html#e1fe7fb65133dd6ffc227e6fcdd18fdd">stp_dither_internal</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Dither functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="a1" args="" --><p>
+<a class="anchor" name="575ca9b45d518b92177323e70295198a"></a><!-- doxytag: member="dither.h::STP_ECOLOR_C" ref="575ca9b45d518b92177323e70295198a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -139,7 +153,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="a0" args="" --><p>
+<a class="anchor" name="4faa7aec0dc7471ed5a7d1622991ac77"></a><!-- doxytag: member="dither.h::STP_ECOLOR_K" ref="4faa7aec0dc7471ed5a7d1622991ac77" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -162,7 +176,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="a2" args="" --><p>
+<a class="anchor" name="c7f1f45ff56dfbaff0a36599c6bf822c"></a><!-- doxytag: member="dither.h::STP_ECOLOR_M" ref="c7f1f45ff56dfbaff0a36599c6bf822c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -185,7 +199,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="a3" args="" --><p>
+<a class="anchor" name="e1492502d48a830e5dda11f1d7afb494"></a><!-- doxytag: member="dither.h::STP_ECOLOR_Y" ref="e1492502d48a830e5dda11f1d7afb494" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -208,7 +222,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="a4" args="" --><p>
+<a class="anchor" name="3e02bef38f178e66a4439df6ec61c503"></a><!-- doxytag: member="dither.h::STP_NCOLORS" ref="3e02bef38f178e66a4439df6ec61c503" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -232,7 +246,7 @@ Dither functions.
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a7"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="a7" args="" --><p>
+<a class="anchor" name="c81f99c36dbc48c619831897bac28224"></a><!-- doxytag: member="dither.h::stp_dither_matrix_generic_t" ref="c81f99c36dbc48c619831897bac28224" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -255,7 +269,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="a8" args="" --><p>
+<a class="anchor" name="613c628e788dbef089fa32243500cd54"></a><!-- doxytag: member="dither.h::stp_dither_matrix_impl_t" ref="613c628e788dbef089fa32243500cd54" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -278,7 +292,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="a6" args="" --><p>
+<a class="anchor" name="a7bbfbb8dd05a8c05a5c37143adc129a"></a><!-- doxytag: member="dither.h::stp_dither_matrix_normal_t" ref="a7bbfbb8dd05a8c05a5c37143adc129a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -301,7 +315,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="a5" args="" --><p>
+<a class="anchor" name="373f2efaf250ca412b5447b8bd4e7f51"></a><!-- doxytag: member="dither.h::stp_dither_matrix_short_t" ref="373f2efaf250ca412b5447b8bd4e7f51" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -324,7 +338,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="a9" args="" --><p>
+<a class="anchor" name="0a4617ed6063c68c6c8675fb9e8e9d01"></a><!-- doxytag: member="dither.h::stp_dotsize_t" ref="0a4617ed6063c68c6c8675fb9e8e9d01" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -347,7 +361,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="a10" args="" --><p>
+<a class="anchor" name="737b4edb8992127d0616e78f6c0a4c14"></a><!-- doxytag: member="dither.h::stp_shade_t" ref="737b4edb8992127d0616e78f6c0a4c14" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -371,7 +385,7 @@ Dither functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a40"></a><!-- doxytag: member="dither.h::stp_dither" ref="a40" args="(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)" --><p>
+<a class="anchor" name="a22b0e4fe00acaf11ce611e29f1b1ba3"></a><!-- doxytag: member="dither.h::stp_dither" ref="a22b0e4fe00acaf11ce611e29f1b1ba3" args="(stp_vars_t *v, int row, int duplicate_line, int zero_mask, const unsigned char *mask)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -379,7 +393,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -426,7 +440,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a38"></a><!-- doxytag: member="dither.h::stp_dither_add_channel" ref="a38" args="(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)" --><p>
+<a class="anchor" name="28bb47c7e1436e2c4af3b0be87b5d1c6"></a><!-- doxytag: member="dither.h::stp_dither_add_channel" ref="28bb47c7e1436e2c4af3b0be87b5d1c6" args="(stp_vars_t *v, unsigned char *data, unsigned channel, unsigned subchannel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -434,7 +448,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_add_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -475,7 +489,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a24"></a><!-- doxytag: member="dither.h::stp_dither_describe_parameter" ref="a24" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
+<a class="anchor" name="6daf654828bc5235bc785fceb8aebb89"></a><!-- doxytag: member="dither.h::stp_dither_describe_parameter" ref="6daf654828bc5235bc785fceb8aebb89" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -483,7 +497,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_describe_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -518,7 +532,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a39"></a><!-- doxytag: member="dither.h::stp_dither_get_channel" ref="a39" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" --><p>
+<a class="anchor" name="94da054fb7a3f42cf4c2937f4d37e528"></a><!-- doxytag: member="dither.h::stp_dither_get_channel" ref="94da054fb7a3f42cf4c2937f4d37e528" args="(stp_vars_t *v, unsigned channel, unsigned subchannel)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -526,7 +540,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">unsigned char* stp_dither_get_channel           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -561,7 +575,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a33"></a><!-- doxytag: member="dither.h::stp_dither_get_first_position" ref="a33" args="(stp_vars_t *v, int color, int subchan)" --><p>
+<a class="anchor" name="f113ac1043230813204db189e3fd84a8"></a><!-- doxytag: member="dither.h::stp_dither_get_first_position" ref="f113ac1043230813204db189e3fd84a8" args="(stp_vars_t *v, int color, int subchan)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -569,7 +583,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">int stp_dither_get_first_position           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -604,7 +618,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a34"></a><!-- doxytag: member="dither.h::stp_dither_get_last_position" ref="a34" args="(stp_vars_t *v, int color, int subchan)" --><p>
+<a class="anchor" name="e13f1c62835c48c5fb58b45c8ed35f32"></a><!-- doxytag: member="dither.h::stp_dither_get_last_position" ref="e13f1c62835c48c5fb58b45c8ed35f32" args="(stp_vars_t *v, int color, int subchan)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -612,7 +626,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">int stp_dither_get_last_position           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -647,7 +661,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a25"></a><!-- doxytag: member="dither.h::stp_dither_init" ref="a25" args="(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)" --><p>
+<a class="anchor" name="6d409bf6395231621a725a45fac8bb8e"></a><!-- doxytag: member="dither.h::stp_dither_init" ref="6d409bf6395231621a725a45fac8bb8e" args="(stp_vars_t *v, stp_image_t *image, int out_width, int xdpi, int ydpi)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -655,7 +669,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_init           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -702,7 +716,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a41"></a><!-- doxytag: member="dither.h::stp_dither_internal" ref="a41" args="(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)" --><p>
+<a class="anchor" name="e1fe7fb65133dd6ffc227e6fcdd18fdd"></a><!-- doxytag: member="dither.h::stp_dither_internal" ref="e1fe7fb65133dd6ffc227e6fcdd18fdd" args="(stp_vars_t *v, int row, const unsigned short *input, int duplicate_line, int zero_mask, const unsigned char *mask)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -710,7 +724,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_internal           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -763,15 +777,15 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="a23" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="9ad687cfc22956dd88495ae0a831c1b6"></a><!-- doxytag: member="dither.h::stp_dither_list_parameters" ref="9ad687cfc22956dd88495ae0a831c1b6" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_dither_list_parameters           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_dither_list_parameters           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -791,7 +805,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="dither.h::stp_dither_matrix_clone" ref="a18" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)" --><p>
+<a class="anchor" name="aaa6d937beb5f9bef6e7ec34fc776d54"></a><!-- doxytag: member="dither.h::stp_dither_matrix_clone" ref="aaa6d937beb5f9bef6e7ec34fc776d54" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest, int x_offset, int y_offset)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -840,7 +854,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="dither.h::stp_dither_matrix_copy" ref="a19" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)" --><p>
+<a class="anchor" name="289ae89081129060bf67371d7ce9fcef"></a><!-- doxytag: member="dither.h::stp_dither_matrix_copy" ref="289ae89081129060bf67371d7ce9fcef" args="(const stp_dither_matrix_impl_t *src, stp_dither_matrix_impl_t *dest)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -877,7 +891,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="a17" args="(stp_dither_matrix_impl_t *mat)" --><p>
+<a class="anchor" name="361cf36b4875e8ef2c8152f66d4a9284"></a><!-- doxytag: member="dither.h::stp_dither_matrix_destroy" ref="361cf36b4875e8ef2c8152f66d4a9284" args="(stp_dither_matrix_impl_t *mat)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -905,7 +919,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init" ref="a13" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)" --><p>
+<a class="anchor" name="8346fdae0bfb7422f52c0a2eec3abd87"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init" ref="8346fdae0bfb7422f52c0a2eec3abd87" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned int *array, int transpose, int prescaled)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -966,7 +980,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_from_dither_array" ref="a16" args="(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)" --><p>
+<a class="anchor" name="a9efd9cefabdab92a8ce5fbf7aca8876"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_from_dither_array" ref="a9efd9cefabdab92a8ce5fbf7aca8876" args="(stp_dither_matrix_impl_t *mat, const stp_array_t *array, int transpose)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -980,7 +994,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -1009,7 +1023,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_short" ref="a14" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)" --><p>
+<a class="anchor" name="6a7a7142c53dd1cd70b3f7fb481e5564"></a><!-- doxytag: member="dither.h::stp_dither_matrix_init_short" ref="6a7a7142c53dd1cd70b3f7fb481e5564" args="(stp_dither_matrix_impl_t *mat, int x_size, int y_size, const unsigned short *array, int transpose, int prescaled)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1070,7 +1084,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="dither.h::stp_dither_matrix_iterated_init" ref="a11" args="(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)" --><p>
+<a class="anchor" name="e79d2866600d79be412b660f036995f4"></a><!-- doxytag: member="dither.h::stp_dither_matrix_iterated_init" ref="e79d2866600d79be412b660f036995f4" args="(stp_dither_matrix_impl_t *mat, size_t size, size_t exponent, const unsigned *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1119,7 +1133,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="dither.h::stp_dither_matrix_scale_exponentially" ref="a20" args="(stp_dither_matrix_impl_t *mat, double exponent)" --><p>
+<a class="anchor" name="0d1f33cd934e13ed0b0f859d131efbc1"></a><!-- doxytag: member="dither.h::stp_dither_matrix_scale_exponentially" ref="0d1f33cd934e13ed0b0f859d131efbc1" args="(stp_dither_matrix_impl_t *mat, double exponent)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1156,7 +1170,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="dither.h::stp_dither_matrix_set_row" ref="a21" args="(stp_dither_matrix_impl_t *mat, int y)" --><p>
+<a class="anchor" name="c329929a25c54355a7ed23f23616ced5"></a><!-- doxytag: member="dither.h::stp_dither_matrix_set_row" ref="c329929a25c54355a7ed23f23616ced5" args="(stp_dither_matrix_impl_t *mat, int y)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1193,7 +1207,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="dither.h::stp_dither_matrix_shear" ref="a12" args="(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)" --><p>
+<a class="anchor" name="1c29e4d285f27f7fd300643f7023f305"></a><!-- doxytag: member="dither.h::stp_dither_matrix_shear" ref="1c29e4d285f27f7fd300643f7023f305" args="(stp_dither_matrix_impl_t *mat, int x_shear, int y_shear)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1236,7 +1250,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="a15" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="05677f96e6de536ecf91a65ee0715998"></a><!-- doxytag: member="dither.h::stp_dither_matrix_validate_array" ref="05677f96e6de536ecf91a65ee0715998" args="(const stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1244,7 +1258,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">int stp_dither_matrix_validate_array           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1264,7 +1278,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a32"></a><!-- doxytag: member="dither.h::stp_dither_set_adaptive_limit" ref="a32" args="(stp_vars_t *v, double limit)" --><p>
+<a class="anchor" name="d261306c74a8affdf11ad2cc519e8bba"></a><!-- doxytag: member="dither.h::stp_dither_set_adaptive_limit" ref="d261306c74a8affdf11ad2cc519e8bba" args="(stp_vars_t *v, double limit)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1272,7 +1286,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_adaptive_limit           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1301,7 +1315,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a31"></a><!-- doxytag: member="dither.h::stp_dither_set_ink_spread" ref="a31" args="(stp_vars_t *v, int spread)" --><p>
+<a class="anchor" name="744fa9a5d204da486f07a8f1b21c9ba3"></a><!-- doxytag: member="dither.h::stp_dither_set_ink_spread" ref="744fa9a5d204da486f07a8f1b21c9ba3" args="(stp_vars_t *v, int spread)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1309,7 +1323,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_ink_spread           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1338,7 +1352,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a37"></a><!-- doxytag: member="dither.h::stp_dither_set_inks" ref="a37" args="(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)" --><p>
+<a class="anchor" name="fd1d75ef5cfb0e013601a4e084352786"></a><!-- doxytag: member="dither.h::stp_dither_set_inks" ref="fd1d75ef5cfb0e013601a4e084352786" args="(stp_vars_t *v, int color, double density, double darkness, int nshades, const double *svalues, int ndotsizes, const double *dvalues)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1346,7 +1360,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_inks           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1411,7 +1425,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a36"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_full" ref="a36" args="(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)" --><p>
+<a class="anchor" name="0aae5a947e8953323b097fbb79c93c68"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_full" ref="0aae5a947e8953323b097fbb79c93c68" args="(stp_vars_t *v, int color, int nshades, const stp_shade_t *shades, double density, double darkness)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1419,7 +1433,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_inks_full           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1472,7 +1486,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a35"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_simple" ref="a35" args="(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)" --><p>
+<a class="anchor" name="ffc1834e675956e79ae5a866895db39c"></a><!-- doxytag: member="dither.h::stp_dither_set_inks_simple" ref="ffc1834e675956e79ae5a866895db39c" args="(stp_vars_t *v, int color, int nlevels, const double *levels, double density, double darkness)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1480,7 +1494,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_inks_simple           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1533,7 +1547,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a26"></a><!-- doxytag: member="dither.h::stp_dither_set_iterated_matrix" ref="a26" args="(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)" --><p>
+<a class="anchor" name="85eb5568b8a8036271e50794519c08e2"></a><!-- doxytag: member="dither.h::stp_dither_set_iterated_matrix" ref="85eb5568b8a8036271e50794519c08e2" args="(stp_vars_t *v, size_t edge, size_t iterations, const unsigned *data, int prescaled, int x_shear, int y_shear)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1541,7 +1555,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_iterated_matrix           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1600,7 +1614,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a27"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix" ref="a27" args="(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)" --><p>
+<a class="anchor" name="25b3d76810fd0dcb0928edff37060409"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix" ref="25b3d76810fd0dcb0928edff37060409" args="(stp_vars_t *v, const stp_dither_matrix_generic_t *mat, int transpose, int x_shear, int y_shear)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1608,7 +1622,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_matrix           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1655,7 +1669,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a28"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix_from_dither_array" ref="a28" args="(stp_vars_t *v, const stp_array_t *array, int transpose)" --><p>
+<a class="anchor" name="ae5be944ec353d075ea17c32370270bd"></a><!-- doxytag: member="dither.h::stp_dither_set_matrix_from_dither_array" ref="ae5be944ec353d075ea17c32370270bd" args="(stp_vars_t *v, const stp_array_t *array, int transpose)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1663,13 +1677,13 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_matrix_from_dither_array           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -1698,7 +1712,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a30"></a><!-- doxytag: member="dither.h::stp_dither_set_randomizer" ref="a30" args="(stp_vars_t *v, int color, double)" --><p>
+<a class="anchor" name="6d8fc8a344a764f92ee43ff8b959aace"></a><!-- doxytag: member="dither.h::stp_dither_set_randomizer" ref="6d8fc8a344a764f92ee43ff8b959aace" args="(stp_vars_t *v, int color, double)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1706,7 +1720,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_randomizer           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1741,7 +1755,7 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a29"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="a29" args="(stp_vars_t *v, double)" --><p>
+<a class="anchor" name="d7cd0b4e7bf474516b14d0a186b23b96"></a><!-- doxytag: member="dither.h::stp_dither_set_transition" ref="d7cd0b4e7bf474516b14d0a186b23b96" args="(stp_vars_t *v, double)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1749,7 +1763,7 @@ Dither functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_dither_set_transition           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1778,13 +1792,13 @@ Dither functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="dither.h::stp_find_standard_dither_array" ref="a22" args="(int x_aspect, int y_aspect)" --><p>
+<a class="anchor" name="ef8ca9aa08ab848746e370100a4b20e2"></a><!-- doxytag: member="dither.h::stp_find_standard_dither_array" ref="ef8ca9aa08ab848746e370100a4b20e2" args="(int x_aspect, int y_aspect)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_find_standard_dither_array           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_find_standard_dither_array           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">int&nbsp;</td>
           <td class="mdname" nowrap> <em>x_aspect</em>, </td>
@@ -1815,8 +1829,8 @@ Dither functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/doxygen.css b/doc/gutenprint/html/doxygen.css
index decae9e..05615b2 100644
--- a/doc/gutenprint/html/doxygen.css
+++ b/doc/gutenprint/html/doxygen.css
@@ -17,8 +17,8 @@ H3 {
 CAPTION { font-weight: bold }
 DIV.qindex {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
@@ -26,16 +26,16 @@ DIV.qindex {
 }
 DIV.nav {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
 	line-height: 140%;
 }
 DIV.navtab {
-       background-color: #eeeeff;
-       border: 1px solid #b0b0b0;
+       background-color: #e8eef2;
+       border: 1px solid #84b0c7;
        text-align: center;
        margin: 2px;
        margin-right: 15px;
@@ -118,7 +118,7 @@ BODY {
 	margin-left: 20px;
 }
 TD.indexkey {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-weight: bold;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -131,7 +131,7 @@ TD.indexkey {
 	border: 1px solid #CCCCCC;
 }
 TD.indexvalue {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-style: italic;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -286,24 +286,25 @@ FORM.search {
 INPUT.search { font-size: 75%;
                color: #000080;
                font-weight: normal;
-               background-color: #eeeeff;
+               background-color: #e8eef2;
 }
 TD.tiny      { font-size: 75%;
 }
 a {
-	color: #252E78;
+	color: #1A41A8;
 }
 a:visited {
-	color: #3D2185;
+	color: #2A3798;
 }
 .dirtab { padding: 4px;
           border-collapse: collapse;
-          border: 1px solid #b0b0b0;
+          border: 1px solid #84b0c7;
 }
-TH.dirtab { background: #eeeeff;
+TH.dirtab { background: #e8eef2;
             font-weight: bold;
 }
 HR { height: 1px;
      border: none;
      border-top: 1px solid black;
 }
+
diff --git a/doc/gutenprint/html/files.html b/doc/gutenprint/html/files.html
index 14e52e8..fc0c57a 100644
--- a/doc/gutenprint/html/files.html
+++ b/doc/gutenprint/html/files.html
@@ -2,9 +2,23 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: File Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindexHL" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference File List</h1>Here is a list of all files with brief descriptions:<table>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="array_8h.html">array.h</a></td><td class="indexvalue">Array functions </td></tr>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="bit-ops_8h.html">bit-ops.h</a></td><td class="indexvalue">Bit operations </td></tr>
@@ -32,8 +46,8 @@
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></td><td class="indexvalue">Softweave functions </td></tr>
   <tr><td class="indexkey">include/gutenprint/<a class="el" href="xml_8h.html">xml.h</a></td><td class="indexvalue">XML tree functions </td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions.html b/doc/gutenprint/html/functions.html
index 527cd18..8e045d2 100644
--- a/doc/gutenprint/html/functions.html
+++ b/doc/gutenprint/html/functions.html
@@ -2,176 +2,223 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindexHL" href="functions.html">All</a> | <a class="qindex" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_f">f</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_j">j</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a> | <a class="qindex" href="#index_w">w</a> | <a class="qindex" href="#index_x">x</a> | <a class="qindex" href="#index_y">y</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li id="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="functions.html"><span>All</span></a></li>
+    <li><a href="functions_vars.html"><span>Variables</span></a></li>
+    <li><a href="functions_type.html"><span>Typedefs</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_d"><span>d</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_f"><span>f</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_j"><span>j</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+    <li><a href="#index_w"><span>w</span></a></li>
+    <li><a href="#index_x"><span>x</span></a></li>
+    <li><a href="#index_y"><span>y</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
-: <a class="el" href="structstp__parameter__t.html#o25">stp_parameter_t</a><li>attrs
-: <a class="el" href="structstp__mxml__value__s.html#o2">stp_mxml_value_s</a></ul>
+: <a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t</a><li>attrs
+: <a class="el" href="structstp__mxml__value__s.html#425ce871530e0633c917f98d8e9b1bc7">stp_mxml_value_s</a></ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl</a><li>bit_pattern
-: <a class="el" href="structstp__dotsize.html#o0">stp_dotsize</a><li>boolean
-: <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t</a><li>bottom
-: <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t</a><li>bounds
-: <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t</a><li>bytes
-: <a class="el" href="structstp__raw__t.html#o0">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#593616de15330c0fb2d55e55410bf994">dither_matrix_impl</a><li>bit_pattern
+: <a class="el" href="structstp__dotsize.html#67b7bfbc0ce2bbedbf5837e91f8773cd">stp_dotsize</a><li>boolean
+: <a class="el" href="structstp__parameter__t.html#84e2c64f38f78ba3ea5c905ab5a2da27">stp_parameter_t</a><li>bottom
+: <a class="el" href="structstp__papersize__t.html#71f262d796bed1ab30e8a2d5a8ddee6f">stp_papersize_t</a><li>bounds
+: <a class="el" href="structstp__parameter__t.html#eb49194cccc646fc8e93a368301834ea">stp_parameter_t</a><li>bytes
+: <a class="el" href="structstp__raw__t.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_short</a></ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>category
-: <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t</a><li>channel
-: <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t</a><li>child
-: <a class="el" href="structstp__mxml__node__s.html#o4">stp_mxml_node_s</a><li>class
-: <a class="el" href="structstp__module.html#o3">stp_module</a><li>colorfuncs
-: <a class="el" href="group__color.html#ga4">stp_color</a><li>comment
-: <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t</a>, <a class="el" href="structstp__module.html#o2">stp_module</a><li>conclude
-: <a class="el" href="group__image.html#ga5">stp_image</a><li>count
-: <a class="el" href="structstp__cached__curve__t.html#o3">stp_cached_curve_t</a><li>curve
-: <a class="el" href="structstp__parameter__t.html#o19">stp_parameter_t</a>, <a class="el" href="structstp__cached__curve__t.html#o0">stp_cached_curve_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#c4ef352f74e502ef5e7bc98e6f4e493d">stp_parameter_t</a><li>channel
+: <a class="el" href="structstp__parameter__t.html#c485d2ed5cc4ce64fcccca710c7a0bb7">stp_parameter_t</a><li>child
+: <a class="el" href="structstp__mxml__node__s.html#1b7d5726533ab525a8760351e9b5e415">stp_mxml_node_s</a><li>class
+: <a class="el" href="structstp__module.html#a2f2ed4f8ebc2cbb4c21a29dc40ab61d">stp_module</a><li>colorfuncs
+: <a class="el" href="structstp__color.html#a3f019e45920da0adf4ce2eec4cc2e7c">stp_color</a><li>comment
+: <a class="el" href="structstp__papersize__t.html#06d4cd63bde972fc66a0aed41d2f5c51">stp_papersize_t</a>, <a class="el" href="structstp__module.html#06d4cd63bde972fc66a0aed41d2f5c51">stp_module</a><li>conclude
+: <a class="el" href="structstp__image.html#6af9f0bf8a602f4a937c6e207a03ec01">stp_image</a><li>count
+: <a class="el" href="structstp__cached__curve__t.html#e2942a04780e223b215eb8b663cf5353">stp_cached_curve_t</a><li>curve
+: <a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_parameter_t</a>, <a class="el" href="structstp__cached__curve__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_cached_curve_t</a></ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
-: <a class="el" href="structstp__cached__curve__t.html#o1">stp_cached_curve_t</a><li>data
-: <a class="el" href="structstp__raw__t.html#o1">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short</a><li>dbl
-: <a class="el" href="structstp__parameter__t.html#o20">stp_parameter_t</a><li>deflt
-: <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t</a><li>describe_output
-: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>describe_parameter
-: <a class="el" href="group__color.html#ga2">stp_colorfuncs_t</a><li>describe_resolution
-: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>dimension
-: <a class="el" href="structstp__parameter__t.html#o21">stp_parameter_t</a><li>dot_sizes
-: <a class="el" href="structstp__shade.html#o2">stp_shade</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#f7e3e9aa11a7dd4199647af2e87a3bab">stp_cached_curve_t</a><li>data
+: <a class="el" href="structstp__raw__t.html#8d777f385d3dfec8815d20f7496026dc">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_short</a><li>dbl
+: <a class="el" href="structstp__parameter__t.html#365b8373d0bf6dc9e3450af670cc1d35">stp_parameter_t</a><li>deflt
+: <a class="el" href="structstp__parameter__t.html#1ae03ed771e3171fae03ed917b22ceff">stp_parameter_t</a><li>describe_output
+: <a class="el" href="structstp__printfuncs__t.html#92224ef5b74a148faa0459a1ff6edd6c">stp_printfuncs_t</a><li>describe_parameter
+: <a class="el" href="structstp__colorfuncs__t.html#358435dd7c4c3dba226ba7016dba0cad">stp_colorfuncs_t</a><li>describe_resolution
+: <a class="el" href="structstp__printfuncs__t.html#b11ae31fa8984f09a03acc5d284f53f8">stp_printfuncs_t</a><li>dimension
+: <a class="el" href="structstp__parameter__t.html#c4cf4802b30127a6ae42a1a1798c51b3">stp_parameter_t</a><li>dot_sizes
+: <a class="el" href="structstp__shade.html#c4b0221c67b0895782c9c5984cc2578e">stp_shade</a></ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u</a><li>end_job
-: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>end_pos
-: <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t</a><li>exp
-: <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#8e2dcfd7e7e24b1ca76c1193f645902b">stp_mxml_value_u</a><li>end_job
+: <a class="el" href="structstp__printfuncs__t.html#f553a87427ad77ead7b8e6bb7f4a2efa">stp_printfuncs_t</a><li>end_pos
+: <a class="el" href="structstp__linebounds__t.html#1f90fb291292e9a933aa6aac4a9c857e">stp_linebounds_t</a><li>exp
+: <a class="el" href="structdither__matrix__impl.html#b0ab0254bd58eb87eaee3172ba49fefb">dither_matrix_impl</a></ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl</a><li>fini
-: <a class="el" href="structstp__module.html#o6">stp_module</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#31acd511b5ec97637395c849e2089e00">dither_matrix_impl</a><li>fini
+: <a class="el" href="structstp__module.html#b5296150c31e6581161fc46595a06b78">stp_module</a></ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="group__image.html#ga4">stp_image</a><li>get_row
-: <a class="el" href="group__image.html#ga3">stp_image</a>, <a class="el" href="group__color.html#ga0">stp_colorfuncs_t</a></ul>
+: <a class="el" href="structstp__image.html#e9495dba1df955709ebbd651c1a526e6">stp_image</a><li>get_row
+: <a class="el" href="structstp__image.html#e2681945ea918b7082ba78751d084347">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#1130ff4ca5f70a5f951b69fa41ef8016">stp_colorfuncs_t</a></ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module.html#o4">stp_module</a><li>height
-: <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t</a>, <a class="el" href="group__image.html#ga2">stp_image</a><li>help
-: <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t</a></ul>
+: <a class="el" href="structstp__module.html#e1260894f59eeae98c8440899de4df8d">stp_module</a><li>height
+: <a class="el" href="structstp__papersize__t.html#b435e227d5dd201e1768b2bcb2e0aa81">stp_papersize_t</a>, <a class="el" href="structstp__image.html#36cffb4418960b12743fc547902e35a6">stp_image</a><li>help
+: <a class="el" href="structstp__parameter__t.html#657f8b8da628ef83cf69101b6817150a">stp_parameter_t</a></ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>i_own
-: <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl</a><li>imageable_area
-: <a class="el" href="structstp__printfuncs__t.html#o3">stp_printfuncs_t</a><li>index
-: <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl</a><li>init
-: <a class="el" href="structstp__module.html#o5">stp_module</a>, <a class="el" href="structstp__image.html#o0">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o0">stp_colorfuncs_t</a><li>integer
-: <a class="el" href="structstp__parameter__t.html#o22">stp_parameter_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u</a><li>is_active
-: <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t</a><li>is_mandatory
-: <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#618931f210c709ac7c0a44ed090aef93">dither_matrix_impl</a><li>imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#d910d40510a98935f74705e1e0c53b6d">stp_printfuncs_t</a><li>index
+: <a class="el" href="structdither__matrix__impl.html#6a992d5529f459a44fee58c733255e86">dither_matrix_impl</a><li>init
+: <a class="el" href="structstp__module.html#e410d3c31d3473619bad7812df075dd9">stp_module</a>, <a class="el" href="structstp__image.html#9aebe24f43e2fe0d4342495a64026baa">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#5aafc0d83b487b1d0a8db5c1f1cd227d">stp_colorfuncs_t</a><li>integer
+: <a class="el" href="structstp__parameter__t.html#157db7df530023575515d366c9b672e8">stp_parameter_t</a>, <a class="el" href="unionstp__mxml__value__u.html#157db7df530023575515d366c9b672e8">stp_mxml_value_u</a><li>is_active
+: <a class="el" href="structstp__parameter__t.html#4264c638e0098acb172519b0436db099">stp_parameter_t</a><li>is_mandatory
+: <a class="el" href="structstp__parameter__t.html#c261f1bf67a23fb36eadbb2c644c162f">stp_parameter_t</a></ul>
 <h3><a class="anchor" name="index_j">- j -</a></h3><ul>
 <li>jet
-: <a class="el" href="structstp__weave__t.html#o2">stp_weave_t</a></ul>
+: <a class="el" href="structstp__weave__t.html#564f60a2dd82ea24bfa3f2f615348f7c">stp_weave_t</a></ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last_child
-: <a class="el" href="structstp__mxml__node__s.html#o5">stp_mxml_node_s</a><li>last_x
-: <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl</a><li>last_x_mod
-: <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl</a><li>last_y
-: <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl</a><li>last_y_mod
-: <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl</a><li>left
-: <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t</a><li>limit
-: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>list_parameters
-: <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t</a>, <a class="el" href="group__color.html#ga1">stp_colorfuncs_t</a><li>logicalpassstart
-: <a class="el" href="structstp__pass__t.html#o2">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o4">stp_weave_t</a><li>long_name
-: <a class="el" href="group__color.html#ga3">stp_color</a><li>lower
-: <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__mxml__node__s.html#683657fb65ef37f597bddef3847a3eff">stp_mxml_node_s</a><li>last_x
+: <a class="el" href="structdither__matrix__impl.html#94f66fddf2c8dd22340220c82f6115fd">dither_matrix_impl</a><li>last_x_mod
+: <a class="el" href="structdither__matrix__impl.html#f1cbd20a4cb7668e3b450ae3c7879fb2">dither_matrix_impl</a><li>last_y
+: <a class="el" href="structdither__matrix__impl.html#dcf093deead926d5e89cdf4cf72068cf">dither_matrix_impl</a><li>last_y_mod
+: <a class="el" href="structdither__matrix__impl.html#ea9a91cee135cee3ba2750f2875cf610">dither_matrix_impl</a><li>left
+: <a class="el" href="structstp__papersize__t.html#811882fecd5c7618d7099ebbd39ea254">stp_papersize_t</a><li>limit
+: <a class="el" href="structstp__printfuncs__t.html#6e40367cc4c593d8c68138abdc46e4ef">stp_printfuncs_t</a><li>list_parameters
+: <a class="el" href="structstp__printfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">stp_printfuncs_t</a>, <a class="el" href="structstp__colorfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">stp_colorfuncs_t</a><li>logicalpassstart
+: <a class="el" href="structstp__pass__t.html#da94ad894675e9119f2c647a94e21605">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#da94ad894675e9119f2c647a94e21605">stp_weave_t</a><li>long_name
+: <a class="el" href="structstp__color.html#2fc6351aa4209f68fb16e85c6104f96c">stp_color</a><li>lower
+: <a class="el" href="structstp__int__bound__t.html#81e073b428b50247daba38531dcf412a">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#81e073b428b50247daba38531dcf412a">stp_double_bound_t</a></ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <a class="el" href="structstp__module__version.html#o0">stp_module_version</a><li>matrix
-: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>media_size
-: <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t</a><li>minor
-: <a class="el" href="structstp__module__version.html#o1">stp_module_version</a><li>missingstartrows
-: <a class="el" href="structstp__pass__t.html#o1">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o3">stp_weave_t</a></ul>
+: <a class="el" href="structstp__module__version.html#f1425da40a9f2d21ab702a1c7feae026">stp_module_version</a><li>matrix
+: <a class="el" href="structdither__matrix__impl.html#21b72c0b7adc5c7b4a50ffcb90d92dd6">dither_matrix_impl</a><li>media_size
+: <a class="el" href="structstp__printfuncs__t.html#0893788b2db9b714e8185a0d5bc54c65">stp_printfuncs_t</a><li>minor
+: <a class="el" href="structstp__module__version.html#ab846c0e3717a3e7d14af45cab70b44a">stp_module_version</a><li>missingstartrows
+: <a class="el" href="structstp__pass__t.html#6b75dc88fe75f396206e0c5862d61543">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#6b75dc88fe75f396206e0c5862d61543">stp_weave_t</a></ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o0">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#o0">stp_module</a><li>ncolors
-: <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t</a>, <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t</a><li>next
-: <a class="el" href="structstp__mxml__node__s.html#o1">stp_mxml_node_s</a><li>num_attrs
-: <a class="el" href="structstp__mxml__value__s.html#o1">stp_mxml_value_s</a><li>numsizes
-: <a class="el" href="structstp__shade.html#o1">stp_shade</a></ul>
+: <a class="el" href="structstp__parameter__t.html#b068931cc450442b63f5b3d276ea4297">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#b068931cc450442b63f5b3d276ea4297">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#b068931cc450442b63f5b3d276ea4297">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#b068931cc450442b63f5b3d276ea4297">stp_module</a><li>ncolors
+: <a class="el" href="structstp__linebounds__t.html#7e65a932280df4e01f60294f031fb97e">stp_linebounds_t</a>, <a class="el" href="structstp__linebufs__t.html#7e65a932280df4e01f60294f031fb97e">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#7e65a932280df4e01f60294f031fb97e">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#7e65a932280df4e01f60294f031fb97e">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#7e65a932280df4e01f60294f031fb97e">stp_lineoff_t</a><li>next
+: <a class="el" href="structstp__mxml__node__s.html#d0cab90d8d20d57e2f2b9be52f7dd25d">stp_mxml_node_s</a><li>num_attrs
+: <a class="el" href="structstp__mxml__value__s.html#30f1579a824317cbe2b6837454cd0ef1">stp_mxml_value_s</a><li>numsizes
+: <a class="el" href="structstp__shade.html#adae9e852b659d0d064b746f5cc85ee4">stp_shade</a></ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#94619f8a70068b2591c2eed622525b0e">stp_mxml_value_u</a></ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>p_class
-: <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t</a><li>p_level
-: <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t</a><li>p_type
-: <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t</a><li>paper_unit
-: <a class="el" href="structstp__papersize__t.html#o9">stp_papersize_t</a><li>parameters
-: <a class="el" href="structstp__printfuncs__t.html#o1">stp_printfuncs_t</a><li>parent
-: <a class="el" href="structstp__mxml__node__s.html#o3">stp_mxml_node_s</a><li>pass
-: <a class="el" href="structstp__pass__t.html#o0">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o1">stp_weave_t</a><li>physpassend
-: <a class="el" href="structstp__pass__t.html#o4">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o6">stp_weave_t</a><li>physpassstart
-: <a class="el" href="structstp__pass__t.html#o3">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o5">stp_weave_t</a><li>prescaled
-: <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short</a><li>prev
-: <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s</a><li>print
-: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>printer_list
-: <a class="el" href="structstp__family.html#o1">stp_family</a><li>printfuncs
-: <a class="el" href="structstp__family.html#o0">stp_family</a></ul>
+: <a class="el" href="structstp__parameter__t.html#8112bb5792909f9417d1f6d2ab36863a">stp_parameter_t</a><li>p_level
+: <a class="el" href="structstp__parameter__t.html#c52b547d5a185fa1e792e175f90d24fc">stp_parameter_t</a><li>p_type
+: <a class="el" href="structstp__parameter__t.html#ee532d298de9538e682d9a1eaea12378">stp_parameter_t</a><li>paper_unit
+: <a class="el" href="structstp__papersize__t.html#00a9745ae8b0126b5763ba88daba837b">stp_papersize_t</a><li>parameters
+: <a class="el" href="structstp__printfuncs__t.html#622ce298c6fc93028618fed494c284e9">stp_printfuncs_t</a><li>parent
+: <a class="el" href="structstp__mxml__node__s.html#d0e45878043844ffc41aac437e86b602">stp_mxml_node_s</a><li>pass
+: <a class="el" href="structstp__pass__t.html#1a1dc91c907325c69271ddf0c944bc72">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#1a1dc91c907325c69271ddf0c944bc72">stp_weave_t</a><li>physpassend
+: <a class="el" href="structstp__pass__t.html#102875318f07394cc762ba839e0b5231">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#102875318f07394cc762ba839e0b5231">stp_weave_t</a><li>physpassstart
+: <a class="el" href="structstp__pass__t.html#13436ac9693968e5601e30fd01451a02">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#13436ac9693968e5601e30fd01451a02">stp_weave_t</a><li>prescaled
+: <a class="el" href="structstp__dither__matrix__generic.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_short</a><li>prev
+: <a class="el" href="structstp__mxml__node__s.html#fcb08b164ac83e09964deb24f2d2e80b">stp_mxml_node_s</a><li>print
+: <a class="el" href="structstp__printfuncs__t.html#4ba23f8d414bf8d9305fe670b5e7ae94">stp_printfuncs_t</a><li>printer_list
+: <a class="el" href="structstp__family.html#505045dc6abce739a39cbc650ad05535">stp_family</a><li>printfuncs
+: <a class="el" href="structstp__family.html#c0c2f50561daa16ae61c455b0861718a">stp_family</a></ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>read_only
-: <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t</a><li>real
-: <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u</a><li>rep
-: <a class="el" href="group__image.html#ga6">stp_image</a><li>reset
-: <a class="el" href="group__image.html#ga0">stp_image</a><li>right
-: <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t</a><li>row
-: <a class="el" href="structstp__weave__t.html#o0">stp_weave_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#befe72871b2de8f4f0e20108517e31fe">stp_parameter_t</a><li>real
+: <a class="el" href="unionstp__mxml__value__u.html#4bca24304861acde5770fdbe3cc2503b">stp_mxml_value_u</a><li>rep
+: <a class="el" href="structstp__image.html#75a384057459ae8e69fb9a98a249b4f4">stp_image</a><li>reset
+: <a class="el" href="structstp__image.html#edae63ed1524916fdef45cb652d7275e">stp_image</a><li>right
+: <a class="el" href="structstp__papersize__t.html#7c4f29407893c334a6cb7a87bf045c0d">stp_papersize_t</a><li>row
+: <a class="el" href="structstp__weave__t.html#f1965a857bc285d26fe22023aa5ab50d">stp_weave_t</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>s_cache
-: <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t</a><li>short_name
-: <a class="el" href="structstp__color.html#o0">stp_color</a><li>start_job
-: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>start_pos
-: <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t</a><li>str
-: <a class="el" href="structstp__parameter__t.html#o24">stp_parameter_t</a><li>string
-: <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s</a><li>subpass
-: <a class="el" href="structstp__pass__t.html#o5">stp_pass_t</a><li>syms
-: <a class="el" href="structstp__module.html#o7">stp_module</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#9c9886e8af38f75727d2b354afa8f218">stp_cached_curve_t</a><li>short_name
+: <a class="el" href="structstp__color.html#4698bac7fdbf14511adbe13aeefe80b8">stp_color</a><li>start_job
+: <a class="el" href="structstp__printfuncs__t.html#fd889d531bf42b215023ed01d74fecab">stp_printfuncs_t</a><li>start_pos
+: <a class="el" href="structstp__linebounds__t.html#8fb0bcdadf14357992c7faea15fb9497">stp_linebounds_t</a><li>str
+: <a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">stp_parameter_t</a><li>string
+: <a class="el" href="structstp__mxml__text__s.html#b45cffe084dd3d20d928bee85e7b0f21">stp_mxml_text_s</a><li>subpass
+: <a class="el" href="structstp__pass__t.html#769ff675e6c6adb86faf4316c1aa0ba3">stp_pass_t</a><li>syms
+: <a class="el" href="structstp__module.html#928a1fa51ea5f2eaae90429c74743ced">stp_module</a></ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o4">stp_mxml_value_u</a><li>top
-: <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t</a><li>total_size
-: <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl</a><li>type
-: <a class="el" href="structstp__mxml__node__s.html#o0">stp_mxml_node_s</a></ul>
+: <a class="el" href="structstp__parameter__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#1cb251ec0d568de6a929b520c4aed8d1">stp_mxml_value_u</a><li>top
+: <a class="el" href="structstp__papersize__t.html#b28354b543375bfa94dabaeda722927f">stp_papersize_t</a><li>total_size
+: <a class="el" href="structdither__matrix__impl.html#2cd6b347ff013dd494370a9938344885">dither_matrix_impl</a><li>type
+: <a class="el" href="structstp__mxml__node__s.html#599dcce2998a6b40b1e38e8c6006cb0a">stp_mxml_node_s</a></ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>upper
-: <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__int__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_double_bound_t</a></ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t</a><li>value
-: <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#o0">stp_shade</a>, <a class="el" href="structstp__dotsize.html#o1">stp_dotsize</a><li>verify
-: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>verify_this_parameter
-: <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t</a><li>version
-: <a class="el" href="structstp__module.html#o1">stp_module</a></ul>
+: <a class="el" href="structstp__linebufs__t.html#9e3669d19b675bd57058fd4664205d2a">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#9e3669d19b675bd57058fd4664205d2a">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#9e3669d19b675bd57058fd4664205d2a">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#9e3669d19b675bd57058fd4664205d2a">stp_lineoff_t</a><li>value
+: <a class="el" href="structstp__mxml__node__s.html#2063c1608d6e0baf80249c42e2be5804">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#2063c1608d6e0baf80249c42e2be5804">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#2063c1608d6e0baf80249c42e2be5804">stp_shade</a>, <a class="el" href="structstp__dotsize.html#2063c1608d6e0baf80249c42e2be5804">stp_dotsize</a><li>verify
+: <a class="el" href="structstp__printfuncs__t.html#7cc301b263aa0c00e3b8d67b79b9949e">stp_printfuncs_t</a><li>verify_this_parameter
+: <a class="el" href="structstp__parameter__t.html#f07c856ac0ac425e65f87fff7a12b34d">stp_parameter_t</a><li>version
+: <a class="el" href="structstp__module.html#2af72f100c356273d46284f6fd1dfc08">stp_module</a></ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s</a><li>width
-: <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t</a>, <a class="el" href="group__image.html#ga1">stp_image</a></ul>
+: <a class="el" href="structstp__mxml__text__s.html#67b8601a11e47a9ee3bf08ddfd0b79ba">stp_mxml_text_s</a><li>width
+: <a class="el" href="structstp__papersize__t.html#eaae26a6fb20ed3ef54fb23bfa0b1fcc">stp_papersize_t</a>, <a class="el" href="structstp__image.html#85ce2739e10b7c073f108a82b3e5d717">stp_image</a></ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
-: <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t</a><li>x_offset
-: <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl</a><li>x_size
-: <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl</a></ul>
+: <a class="el" href="structstp__dither__matrix__generic.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#9dd4e461268c8034f5c8564e155c67a6">stp_curve_point_t</a><li>x_offset
+: <a class="el" href="structdither__matrix__impl.html#80997876f6afba983eaec918e58ecc0d">dither_matrix_impl</a><li>x_size
+: <a class="el" href="structdither__matrix__impl.html#f0ed41c0ec21ebf3f06c1a1ec9d04456">dither_matrix_impl</a></ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
-: <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
-: <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
-: <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="structstp__dither__matrix__generic.html#415290769594460e2e485922904f345d">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#415290769594460e2e485922904f345d">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#415290769594460e2e485922904f345d">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#415290769594460e2e485922904f345d">stp_curve_point_t</a><li>y_offset
+: <a class="el" href="structdither__matrix__impl.html#6055652d6d84e1c46e19438c923113ff">dither_matrix_impl</a><li>y_size
+: <a class="el" href="structdither__matrix__impl.html#6f8a30ff8882b910eb6092965bff1166">dither_matrix_impl</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/functions_type.html b/doc/gutenprint/html/functions_type.html
new file mode 100644
index 0000000..0a2ebb1
--- /dev/null
+++ b/doc/gutenprint/html/functions_type.html
@@ -0,0 +1,54 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>libgutenprint API Reference: Data Fields - Typedefs</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li id="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="functions.html"><span>All</span></a></li>
+    <li><a href="functions_vars.html"><span>Variables</span></a></li>
+    <li id="current"><a href="functions_type.html"><span>Typedefs</span></a></li>
+  </ul>
+</div>
+&nbsp;
+<p>
+<ul>
+<li>bytes
+: <a class="el" href="structstp__raw__t.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_short</a><li>category
+: <a class="el" href="structstp__parameter__t.html#c4ef352f74e502ef5e7bc98e6f4e493d">stp_parameter_t</a><li>channel
+: <a class="el" href="structstp__parameter__t.html#c485d2ed5cc4ce64fcccca710c7a0bb7">stp_parameter_t</a><li>data
+: <a class="el" href="structstp__raw__t.html#8d777f385d3dfec8815d20f7496026dc">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_short</a><li>help
+: <a class="el" href="structstp__parameter__t.html#657f8b8da628ef83cf69101b6817150a">stp_parameter_t</a><li>is_active
+: <a class="el" href="structstp__parameter__t.html#4264c638e0098acb172519b0436db099">stp_parameter_t</a><li>is_mandatory
+: <a class="el" href="structstp__parameter__t.html#c261f1bf67a23fb36eadbb2c644c162f">stp_parameter_t</a><li>lower
+: <a class="el" href="structstp__int__bound__t.html#81e073b428b50247daba38531dcf412a">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#81e073b428b50247daba38531dcf412a">stp_double_bound_t</a><li>name
+: <a class="el" href="structstp__parameter__t.html#b068931cc450442b63f5b3d276ea4297">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#b068931cc450442b63f5b3d276ea4297">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#b068931cc450442b63f5b3d276ea4297">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#b068931cc450442b63f5b3d276ea4297">stp_module</a><li>p_class
+: <a class="el" href="structstp__parameter__t.html#8112bb5792909f9417d1f6d2ab36863a">stp_parameter_t</a><li>p_level
+: <a class="el" href="structstp__parameter__t.html#c52b547d5a185fa1e792e175f90d24fc">stp_parameter_t</a><li>p_type
+: <a class="el" href="structstp__parameter__t.html#ee532d298de9538e682d9a1eaea12378">stp_parameter_t</a><li>read_only
+: <a class="el" href="structstp__parameter__t.html#befe72871b2de8f4f0e20108517e31fe">stp_parameter_t</a><li>text
+: <a class="el" href="structstp__parameter__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#1cb251ec0d568de6a929b520c4aed8d1">stp_mxml_value_u</a><li>upper
+: <a class="el" href="structstp__int__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_double_bound_t</a><li>verify_this_parameter
+: <a class="el" href="structstp__parameter__t.html#f07c856ac0ac425e65f87fff7a12b34d">stp_parameter_t</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
+</body>
+</html>
diff --git a/doc/gutenprint/html/functions_vars.html b/doc/gutenprint/html/functions_vars.html
index 7be5a51..c1a81cb 100644
--- a/doc/gutenprint/html/functions_vars.html
+++ b/doc/gutenprint/html/functions_vars.html
@@ -2,176 +2,208 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields - Variables</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="functions.html">All</a> | <a class="qindexHL" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_f">f</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_j">j</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a> | <a class="qindex" href="#index_w">w</a> | <a class="qindex" href="#index_x">x</a> | <a class="qindex" href="#index_y">y</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li id="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="functions.html"><span>All</span></a></li>
+    <li id="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+    <li><a href="functions_type.html"><span>Typedefs</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_d"><span>d</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_f"><span>f</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_j"><span>j</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+    <li><a href="#index_w"><span>w</span></a></li>
+    <li><a href="#index_x"><span>x</span></a></li>
+    <li><a href="#index_y"><span>y</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>array
-: <a class="el" href="structstp__parameter__t.html#o25">stp_parameter_t</a><li>attrs
-: <a class="el" href="structstp__mxml__value__s.html#o2">stp_mxml_value_s</a></ul>
+: <a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t</a><li>attrs
+: <a class="el" href="structstp__mxml__value__s.html#425ce871530e0633c917f98d8e9b1bc7">stp_mxml_value_s</a></ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>base
-: <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl</a><li>bit_pattern
-: <a class="el" href="structstp__dotsize.html#o0">stp_dotsize</a><li>boolean
-: <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t</a><li>bottom
-: <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t</a><li>bounds
-: <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t</a><li>bytes
-: <a class="el" href="structstp__raw__t.html#o0">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#593616de15330c0fb2d55e55410bf994">dither_matrix_impl</a><li>bit_pattern
+: <a class="el" href="structstp__dotsize.html#67b7bfbc0ce2bbedbf5837e91f8773cd">stp_dotsize</a><li>boolean
+: <a class="el" href="structstp__parameter__t.html#84e2c64f38f78ba3ea5c905ab5a2da27">stp_parameter_t</a><li>bottom
+: <a class="el" href="structstp__papersize__t.html#71f262d796bed1ab30e8a2d5a8ddee6f">stp_papersize_t</a><li>bounds
+: <a class="el" href="structstp__parameter__t.html#eb49194cccc646fc8e93a368301834ea">stp_parameter_t</a><li>bytes
+: <a class="el" href="structstp__raw__t.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_short</a></ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
-<li>category
-: <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t</a><li>channel
-: <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t</a><li>child
-: <a class="el" href="structstp__mxml__node__s.html#o4">stp_mxml_node_s</a><li>class
-: <a class="el" href="structstp__module.html#o3">stp_module</a><li>colorfuncs
-: <a class="el" href="group__color.html#ga4">stp_color</a><li>comment
-: <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t</a>, <a class="el" href="structstp__module.html#o2">stp_module</a><li>conclude
-: <a class="el" href="group__image.html#ga5">stp_image</a><li>count
-: <a class="el" href="structstp__cached__curve__t.html#o3">stp_cached_curve_t</a><li>curve
-: <a class="el" href="structstp__parameter__t.html#o19">stp_parameter_t</a>, <a class="el" href="structstp__cached__curve__t.html#o0">stp_cached_curve_t</a></ul>
+<li>child
+: <a class="el" href="structstp__mxml__node__s.html#1b7d5726533ab525a8760351e9b5e415">stp_mxml_node_s</a><li>class
+: <a class="el" href="structstp__module.html#a2f2ed4f8ebc2cbb4c21a29dc40ab61d">stp_module</a><li>colorfuncs
+: <a class="el" href="structstp__color.html#a3f019e45920da0adf4ce2eec4cc2e7c">stp_color</a><li>comment
+: <a class="el" href="structstp__papersize__t.html#06d4cd63bde972fc66a0aed41d2f5c51">stp_papersize_t</a>, <a class="el" href="structstp__module.html#06d4cd63bde972fc66a0aed41d2f5c51">stp_module</a><li>conclude
+: <a class="el" href="structstp__image.html#6af9f0bf8a602f4a937c6e207a03ec01">stp_image</a><li>count
+: <a class="el" href="structstp__cached__curve__t.html#e2942a04780e223b215eb8b663cf5353">stp_cached_curve_t</a><li>curve
+: <a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_parameter_t</a>, <a class="el" href="structstp__cached__curve__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_cached_curve_t</a></ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>d_cache
-: <a class="el" href="structstp__cached__curve__t.html#o1">stp_cached_curve_t</a><li>data
-: <a class="el" href="structstp__raw__t.html#o1">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short</a><li>dbl
-: <a class="el" href="structstp__parameter__t.html#o20">stp_parameter_t</a><li>deflt
-: <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t</a><li>describe_output
-: <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t</a><li>describe_parameter
-: <a class="el" href="group__color.html#ga2">stp_colorfuncs_t</a><li>describe_resolution
-: <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t</a><li>dimension
-: <a class="el" href="structstp__parameter__t.html#o21">stp_parameter_t</a><li>dot_sizes
-: <a class="el" href="structstp__shade.html#o2">stp_shade</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#f7e3e9aa11a7dd4199647af2e87a3bab">stp_cached_curve_t</a><li>data
+: <a class="el" href="structstp__raw__t.html#8d777f385d3dfec8815d20f7496026dc">stp_raw_t</a>, <a class="el" href="structstp__dither__matrix__generic.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_short</a><li>dbl
+: <a class="el" href="structstp__parameter__t.html#365b8373d0bf6dc9e3450af670cc1d35">stp_parameter_t</a><li>deflt
+: <a class="el" href="structstp__parameter__t.html#1ae03ed771e3171fae03ed917b22ceff">stp_parameter_t</a><li>describe_output
+: <a class="el" href="structstp__printfuncs__t.html#92224ef5b74a148faa0459a1ff6edd6c">stp_printfuncs_t</a><li>describe_parameter
+: <a class="el" href="structstp__colorfuncs__t.html#358435dd7c4c3dba226ba7016dba0cad">stp_colorfuncs_t</a><li>describe_resolution
+: <a class="el" href="structstp__printfuncs__t.html#b11ae31fa8984f09a03acc5d284f53f8">stp_printfuncs_t</a><li>dimension
+: <a class="el" href="structstp__parameter__t.html#c4cf4802b30127a6ae42a1a1798c51b3">stp_parameter_t</a><li>dot_sizes
+: <a class="el" href="structstp__shade.html#c4b0221c67b0895782c9c5984cc2578e">stp_shade</a></ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>element
-: <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u</a><li>end_job
-: <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t</a><li>end_pos
-: <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t</a><li>exp
-: <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#8e2dcfd7e7e24b1ca76c1193f645902b">stp_mxml_value_u</a><li>end_job
+: <a class="el" href="structstp__printfuncs__t.html#f553a87427ad77ead7b8e6bb7f4a2efa">stp_printfuncs_t</a><li>end_pos
+: <a class="el" href="structstp__linebounds__t.html#1f90fb291292e9a933aa6aac4a9c857e">stp_linebounds_t</a><li>exp
+: <a class="el" href="structdither__matrix__impl.html#b0ab0254bd58eb87eaee3172ba49fefb">dither_matrix_impl</a></ul>
 <h3><a class="anchor" name="index_f">- f -</a></h3><ul>
 <li>fast_mask
-: <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl</a><li>fini
-: <a class="el" href="structstp__module.html#o6">stp_module</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#31acd511b5ec97637395c849e2089e00">dither_matrix_impl</a><li>fini
+: <a class="el" href="structstp__module.html#b5296150c31e6581161fc46595a06b78">stp_module</a></ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_appname
-: <a class="el" href="group__image.html#ga4">stp_image</a><li>get_row
-: <a class="el" href="group__image.html#ga3">stp_image</a>, <a class="el" href="group__color.html#ga0">stp_colorfuncs_t</a></ul>
+: <a class="el" href="structstp__image.html#e9495dba1df955709ebbd651c1a526e6">stp_image</a><li>get_row
+: <a class="el" href="structstp__image.html#e2681945ea918b7082ba78751d084347">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#1130ff4ca5f70a5f951b69fa41ef8016">stp_colorfuncs_t</a></ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>handle
-: <a class="el" href="structstp__module.html#o4">stp_module</a><li>height
-: <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t</a>, <a class="el" href="group__image.html#ga2">stp_image</a><li>help
-: <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t</a></ul>
+: <a class="el" href="structstp__module.html#e1260894f59eeae98c8440899de4df8d">stp_module</a><li>height
+: <a class="el" href="structstp__papersize__t.html#b435e227d5dd201e1768b2bcb2e0aa81">stp_papersize_t</a>, <a class="el" href="structstp__image.html#36cffb4418960b12743fc547902e35a6">stp_image</a></ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>i_own
-: <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl</a><li>imageable_area
-: <a class="el" href="structstp__printfuncs__t.html#o3">stp_printfuncs_t</a><li>index
-: <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl</a><li>init
-: <a class="el" href="structstp__module.html#o5">stp_module</a>, <a class="el" href="structstp__image.html#o0">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#o0">stp_colorfuncs_t</a><li>integer
-: <a class="el" href="structstp__parameter__t.html#o22">stp_parameter_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u</a><li>is_active
-: <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t</a><li>is_mandatory
-: <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t</a></ul>
+: <a class="el" href="structdither__matrix__impl.html#618931f210c709ac7c0a44ed090aef93">dither_matrix_impl</a><li>imageable_area
+: <a class="el" href="structstp__printfuncs__t.html#d910d40510a98935f74705e1e0c53b6d">stp_printfuncs_t</a><li>index
+: <a class="el" href="structdither__matrix__impl.html#6a992d5529f459a44fee58c733255e86">dither_matrix_impl</a><li>init
+: <a class="el" href="structstp__module.html#e410d3c31d3473619bad7812df075dd9">stp_module</a>, <a class="el" href="structstp__image.html#9aebe24f43e2fe0d4342495a64026baa">stp_image</a>, <a class="el" href="structstp__colorfuncs__t.html#5aafc0d83b487b1d0a8db5c1f1cd227d">stp_colorfuncs_t</a><li>integer
+: <a class="el" href="structstp__parameter__t.html#157db7df530023575515d366c9b672e8">stp_parameter_t</a>, <a class="el" href="unionstp__mxml__value__u.html#157db7df530023575515d366c9b672e8">stp_mxml_value_u</a></ul>
 <h3><a class="anchor" name="index_j">- j -</a></h3><ul>
 <li>jet
-: <a class="el" href="structstp__weave__t.html#o2">stp_weave_t</a></ul>
+: <a class="el" href="structstp__weave__t.html#564f60a2dd82ea24bfa3f2f615348f7c">stp_weave_t</a></ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last_child
-: <a class="el" href="structstp__mxml__node__s.html#o5">stp_mxml_node_s</a><li>last_x
-: <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl</a><li>last_x_mod
-: <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl</a><li>last_y
-: <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl</a><li>last_y_mod
-: <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl</a><li>left
-: <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t</a><li>limit
-: <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t</a><li>list_parameters
-: <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t</a>, <a class="el" href="group__color.html#ga1">stp_colorfuncs_t</a><li>logicalpassstart
-: <a class="el" href="structstp__pass__t.html#o2">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o4">stp_weave_t</a><li>long_name
-: <a class="el" href="group__color.html#ga3">stp_color</a><li>lower
-: <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__mxml__node__s.html#683657fb65ef37f597bddef3847a3eff">stp_mxml_node_s</a><li>last_x
+: <a class="el" href="structdither__matrix__impl.html#94f66fddf2c8dd22340220c82f6115fd">dither_matrix_impl</a><li>last_x_mod
+: <a class="el" href="structdither__matrix__impl.html#f1cbd20a4cb7668e3b450ae3c7879fb2">dither_matrix_impl</a><li>last_y
+: <a class="el" href="structdither__matrix__impl.html#dcf093deead926d5e89cdf4cf72068cf">dither_matrix_impl</a><li>last_y_mod
+: <a class="el" href="structdither__matrix__impl.html#ea9a91cee135cee3ba2750f2875cf610">dither_matrix_impl</a><li>left
+: <a class="el" href="structstp__papersize__t.html#811882fecd5c7618d7099ebbd39ea254">stp_papersize_t</a><li>limit
+: <a class="el" href="structstp__printfuncs__t.html#6e40367cc4c593d8c68138abdc46e4ef">stp_printfuncs_t</a><li>list_parameters
+: <a class="el" href="structstp__printfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">stp_printfuncs_t</a>, <a class="el" href="structstp__colorfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">stp_colorfuncs_t</a><li>logicalpassstart
+: <a class="el" href="structstp__pass__t.html#da94ad894675e9119f2c647a94e21605">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#da94ad894675e9119f2c647a94e21605">stp_weave_t</a><li>long_name
+: <a class="el" href="structstp__color.html#2fc6351aa4209f68fb16e85c6104f96c">stp_color</a></ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>major
-: <a class="el" href="structstp__module__version.html#o0">stp_module_version</a><li>matrix
-: <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl</a><li>media_size
-: <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t</a><li>minor
-: <a class="el" href="structstp__module__version.html#o1">stp_module_version</a><li>missingstartrows
-: <a class="el" href="structstp__pass__t.html#o1">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o3">stp_weave_t</a></ul>
+: <a class="el" href="structstp__module__version.html#f1425da40a9f2d21ab702a1c7feae026">stp_module_version</a><li>matrix
+: <a class="el" href="structdither__matrix__impl.html#21b72c0b7adc5c7b4a50ffcb90d92dd6">dither_matrix_impl</a><li>media_size
+: <a class="el" href="structstp__printfuncs__t.html#0893788b2db9b714e8185a0d5bc54c65">stp_printfuncs_t</a><li>minor
+: <a class="el" href="structstp__module__version.html#ab846c0e3717a3e7d14af45cab70b44a">stp_module_version</a><li>missingstartrows
+: <a class="el" href="structstp__pass__t.html#6b75dc88fe75f396206e0c5862d61543">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#6b75dc88fe75f396206e0c5862d61543">stp_weave_t</a></ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o0">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#o0">stp_module</a><li>ncolors
-: <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t</a>, <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t</a><li>next
-: <a class="el" href="structstp__mxml__node__s.html#o1">stp_mxml_node_s</a><li>num_attrs
-: <a class="el" href="structstp__mxml__value__s.html#o1">stp_mxml_value_s</a><li>numsizes
-: <a class="el" href="structstp__shade.html#o1">stp_shade</a></ul>
+: <a class="el" href="structstp__parameter__t.html#b068931cc450442b63f5b3d276ea4297">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#b068931cc450442b63f5b3d276ea4297">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#b068931cc450442b63f5b3d276ea4297">stp_papersize_t</a>, <a class="el" href="structstp__mxml__value__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_value_s</a>, <a class="el" href="structstp__mxml__attr__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_attr_s</a>, <a class="el" href="structstp__module.html#b068931cc450442b63f5b3d276ea4297">stp_module</a><li>ncolors
+: <a class="el" href="structstp__linebounds__t.html#7e65a932280df4e01f60294f031fb97e">stp_linebounds_t</a>, <a class="el" href="structstp__linebufs__t.html#7e65a932280df4e01f60294f031fb97e">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#7e65a932280df4e01f60294f031fb97e">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#7e65a932280df4e01f60294f031fb97e">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#7e65a932280df4e01f60294f031fb97e">stp_lineoff_t</a><li>next
+: <a class="el" href="structstp__mxml__node__s.html#d0cab90d8d20d57e2f2b9be52f7dd25d">stp_mxml_node_s</a><li>num_attrs
+: <a class="el" href="structstp__mxml__value__s.html#30f1579a824317cbe2b6837454cd0ef1">stp_mxml_value_s</a><li>numsizes
+: <a class="el" href="structstp__shade.html#adae9e852b659d0d064b746f5cc85ee4">stp_shade</a></ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>opaque
-: <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u</a></ul>
+: <a class="el" href="unionstp__mxml__value__u.html#94619f8a70068b2591c2eed622525b0e">stp_mxml_value_u</a></ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
-<li>p_class
-: <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t</a><li>p_level
-: <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t</a><li>p_type
-: <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t</a><li>paper_unit
-: <a class="el" href="structstp__papersize__t.html#o9">stp_papersize_t</a><li>parameters
-: <a class="el" href="structstp__printfuncs__t.html#o1">stp_printfuncs_t</a><li>parent
-: <a class="el" href="structstp__mxml__node__s.html#o3">stp_mxml_node_s</a><li>pass
-: <a class="el" href="structstp__pass__t.html#o0">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o1">stp_weave_t</a><li>physpassend
-: <a class="el" href="structstp__pass__t.html#o4">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o6">stp_weave_t</a><li>physpassstart
-: <a class="el" href="structstp__pass__t.html#o3">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#o5">stp_weave_t</a><li>prescaled
-: <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short</a><li>prev
-: <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s</a><li>print
-: <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t</a><li>printer_list
-: <a class="el" href="structstp__family.html#o1">stp_family</a><li>printfuncs
-: <a class="el" href="structstp__family.html#o0">stp_family</a></ul>
+<li>paper_unit
+: <a class="el" href="structstp__papersize__t.html#00a9745ae8b0126b5763ba88daba837b">stp_papersize_t</a><li>parameters
+: <a class="el" href="structstp__printfuncs__t.html#622ce298c6fc93028618fed494c284e9">stp_printfuncs_t</a><li>parent
+: <a class="el" href="structstp__mxml__node__s.html#d0e45878043844ffc41aac437e86b602">stp_mxml_node_s</a><li>pass
+: <a class="el" href="structstp__pass__t.html#1a1dc91c907325c69271ddf0c944bc72">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#1a1dc91c907325c69271ddf0c944bc72">stp_weave_t</a><li>physpassend
+: <a class="el" href="structstp__pass__t.html#102875318f07394cc762ba839e0b5231">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#102875318f07394cc762ba839e0b5231">stp_weave_t</a><li>physpassstart
+: <a class="el" href="structstp__pass__t.html#13436ac9693968e5601e30fd01451a02">stp_pass_t</a>, <a class="el" href="structstp__weave__t.html#13436ac9693968e5601e30fd01451a02">stp_weave_t</a><li>prescaled
+: <a class="el" href="structstp__dither__matrix__generic.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_short</a><li>prev
+: <a class="el" href="structstp__mxml__node__s.html#fcb08b164ac83e09964deb24f2d2e80b">stp_mxml_node_s</a><li>print
+: <a class="el" href="structstp__printfuncs__t.html#4ba23f8d414bf8d9305fe670b5e7ae94">stp_printfuncs_t</a><li>printer_list
+: <a class="el" href="structstp__family.html#505045dc6abce739a39cbc650ad05535">stp_family</a><li>printfuncs
+: <a class="el" href="structstp__family.html#c0c2f50561daa16ae61c455b0861718a">stp_family</a></ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
-<li>read_only
-: <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t</a><li>real
-: <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u</a><li>rep
-: <a class="el" href="group__image.html#ga6">stp_image</a><li>reset
-: <a class="el" href="group__image.html#ga0">stp_image</a><li>right
-: <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t</a><li>row
-: <a class="el" href="structstp__weave__t.html#o0">stp_weave_t</a></ul>
+<li>real
+: <a class="el" href="unionstp__mxml__value__u.html#4bca24304861acde5770fdbe3cc2503b">stp_mxml_value_u</a><li>rep
+: <a class="el" href="structstp__image.html#75a384057459ae8e69fb9a98a249b4f4">stp_image</a><li>reset
+: <a class="el" href="structstp__image.html#edae63ed1524916fdef45cb652d7275e">stp_image</a><li>right
+: <a class="el" href="structstp__papersize__t.html#7c4f29407893c334a6cb7a87bf045c0d">stp_papersize_t</a><li>row
+: <a class="el" href="structstp__weave__t.html#f1965a857bc285d26fe22023aa5ab50d">stp_weave_t</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>s_cache
-: <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t</a><li>short_name
-: <a class="el" href="structstp__color.html#o0">stp_color</a><li>start_job
-: <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t</a><li>start_pos
-: <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t</a><li>str
-: <a class="el" href="structstp__parameter__t.html#o24">stp_parameter_t</a><li>string
-: <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s</a><li>subpass
-: <a class="el" href="structstp__pass__t.html#o5">stp_pass_t</a><li>syms
-: <a class="el" href="structstp__module.html#o7">stp_module</a></ul>
+: <a class="el" href="structstp__cached__curve__t.html#9c9886e8af38f75727d2b354afa8f218">stp_cached_curve_t</a><li>short_name
+: <a class="el" href="structstp__color.html#4698bac7fdbf14511adbe13aeefe80b8">stp_color</a><li>start_job
+: <a class="el" href="structstp__printfuncs__t.html#fd889d531bf42b215023ed01d74fecab">stp_printfuncs_t</a><li>start_pos
+: <a class="el" href="structstp__linebounds__t.html#8fb0bcdadf14357992c7faea15fb9497">stp_linebounds_t</a><li>str
+: <a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">stp_parameter_t</a><li>string
+: <a class="el" href="structstp__mxml__text__s.html#b45cffe084dd3d20d928bee85e7b0f21">stp_mxml_text_s</a><li>subpass
+: <a class="el" href="structstp__pass__t.html#769ff675e6c6adb86faf4316c1aa0ba3">stp_pass_t</a><li>syms
+: <a class="el" href="structstp__module.html#928a1fa51ea5f2eaae90429c74743ced">stp_module</a></ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>text
-: <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#o1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#o4">stp_mxml_value_u</a><li>top
-: <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t</a><li>total_size
-: <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl</a><li>type
-: <a class="el" href="structstp__mxml__node__s.html#o0">stp_mxml_node_s</a></ul>
-<h3><a class="anchor" name="index_u">- u -</a></h3><ul>
-<li>upper
-: <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t</a>, <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t</a></ul>
+: <a class="el" href="structstp__parameter__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_parameter_t</a>, <a class="el" href="structstp__param__string__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_param_string_t</a>, <a class="el" href="structstp__papersize__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_papersize_t</a>, <a class="el" href="unionstp__mxml__value__u.html#1cb251ec0d568de6a929b520c4aed8d1">stp_mxml_value_u</a><li>top
+: <a class="el" href="structstp__papersize__t.html#b28354b543375bfa94dabaeda722927f">stp_papersize_t</a><li>total_size
+: <a class="el" href="structdither__matrix__impl.html#2cd6b347ff013dd494370a9938344885">dither_matrix_impl</a><li>type
+: <a class="el" href="structstp__mxml__node__s.html#599dcce2998a6b40b1e38e8c6006cb0a">stp_mxml_node_s</a></ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t</a><li>value
-: <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#o0">stp_shade</a>, <a class="el" href="structstp__dotsize.html#o1">stp_dotsize</a><li>verify
-: <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t</a><li>verify_this_parameter
-: <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t</a><li>version
-: <a class="el" href="structstp__module.html#o1">stp_module</a></ul>
+: <a class="el" href="structstp__linebufs__t.html#9e3669d19b675bd57058fd4664205d2a">stp_linebufs_t</a>, <a class="el" href="structstp__linecount__t.html#9e3669d19b675bd57058fd4664205d2a">stp_linecount_t</a>, <a class="el" href="structstp__lineactive__t.html#9e3669d19b675bd57058fd4664205d2a">stp_lineactive_t</a>, <a class="el" href="structstp__lineoff__t.html#9e3669d19b675bd57058fd4664205d2a">stp_lineoff_t</a><li>value
+: <a class="el" href="structstp__mxml__node__s.html#2063c1608d6e0baf80249c42e2be5804">stp_mxml_node_s</a>, <a class="el" href="structstp__mxml__attr__s.html#2063c1608d6e0baf80249c42e2be5804">stp_mxml_attr_s</a>, <a class="el" href="structstp__shade.html#2063c1608d6e0baf80249c42e2be5804">stp_shade</a>, <a class="el" href="structstp__dotsize.html#2063c1608d6e0baf80249c42e2be5804">stp_dotsize</a><li>verify
+: <a class="el" href="structstp__printfuncs__t.html#7cc301b263aa0c00e3b8d67b79b9949e">stp_printfuncs_t</a><li>version
+: <a class="el" href="structstp__module.html#2af72f100c356273d46284f6fd1dfc08">stp_module</a></ul>
 <h3><a class="anchor" name="index_w">- w -</a></h3><ul>
 <li>whitespace
-: <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s</a><li>width
-: <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t</a>, <a class="el" href="group__image.html#ga1">stp_image</a></ul>
+: <a class="el" href="structstp__mxml__text__s.html#67b8601a11e47a9ee3bf08ddfd0b79ba">stp_mxml_text_s</a><li>width
+: <a class="el" href="structstp__papersize__t.html#eaae26a6fb20ed3ef54fb23bfa0b1fcc">stp_papersize_t</a>, <a class="el" href="structstp__image.html#85ce2739e10b7c073f108a82b3e5d717">stp_image</a></ul>
 <h3><a class="anchor" name="index_x">- x -</a></h3><ul>
 <li>x
-: <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t</a><li>x_offset
-: <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl</a><li>x_size
-: <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl</a></ul>
+: <a class="el" href="structstp__dither__matrix__generic.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#9dd4e461268c8034f5c8564e155c67a6">stp_curve_point_t</a><li>x_offset
+: <a class="el" href="structdither__matrix__impl.html#80997876f6afba983eaec918e58ecc0d">dither_matrix_impl</a><li>x_size
+: <a class="el" href="structdither__matrix__impl.html#f0ed41c0ec21ebf3f06c1a1ec9d04456">dither_matrix_impl</a></ul>
 <h3><a class="anchor" name="index_y">- y -</a></h3><ul>
 <li>y
-: <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t</a><li>y_offset
-: <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl</a><li>y_size
-: <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="structstp__dither__matrix__generic.html#415290769594460e2e485922904f345d">stp_dither_matrix_generic</a>, <a class="el" href="structstp__dither__matrix__normal.html#415290769594460e2e485922904f345d">stp_dither_matrix_normal</a>, <a class="el" href="structstp__dither__matrix__short.html#415290769594460e2e485922904f345d">stp_dither_matrix_short</a>, <a class="el" href="structstp__curve__point__t.html#415290769594460e2e485922904f345d">stp_curve_point_t</a><li>y_offset
+: <a class="el" href="structdither__matrix__impl.html#6055652d6d84e1c46e19438c923113ff">dither_matrix_impl</a><li>y_size
+: <a class="el" href="structdither__matrix__impl.html#6f8a30ff8882b910eb6092965bff1166">dither_matrix_impl</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals.html b/doc/gutenprint/html/globals.html
index 7671b55..9e2911a 100644
--- a/doc/gutenprint/html/globals.html
+++ b/doc/gutenprint/html/globals.html
@@ -2,20 +2,56 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_
-: <a class="el" href="group__intl.html#ga5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga5">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#gd41443e9a10bd2ffa9508bb74c41c2d1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#gd41443e9a10bd2ffa9508bb74c41c2d1">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x62.html b/doc/gutenprint/html/globals_0x62.html
index b845c2b..2e4d7e4 100644
--- a/doc/gutenprint/html/globals_0x62.html
+++ b/doc/gutenprint/html/globals_0x62.html
@@ -2,20 +2,56 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindexHL" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li id="current"><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>bindtextdomain
-: <a class="el" href="group__intl.html#ga4">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga4">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#gcf29daa2fef5f417c57be476054c695b">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#gcf29daa2fef5f417c57be476054c695b">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x63.html b/doc/gutenprint/html/globals_0x63.html
index 8dd0df6..8e2633f 100644
--- a/doc/gutenprint/html/globals_0x63.html
+++ b/doc/gutenprint/html/globals_0x63.html
@@ -2,23 +2,59 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindexHL" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li id="current"><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>compdata_t
-: <a class="el" href="group__vars.html#ga6">vars.h</a><li>CURVE_CACHE_FAST_COUNT
-: <a class="el" href="curve-cache_8h.html#a2">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
-: <a class="el" href="curve-cache_8h.html#a1">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
-: <a class="el" href="curve-cache_8h.html#a0">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">vars.h</a><li>CURVE_CACHE_FAST_COUNT
+: <a class="el" href="curve-cache_8h.html#b8c3f0a2734a4bdb08989cc62761e8e7">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
+: <a class="el" href="curve-cache_8h.html#b434b6a3a8ce63d95d11b2bce6360536">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
+: <a class="el" href="curve-cache_8h.html#c0763605d9b80d9889407dd340e357fd">curve-cache.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x64.html b/doc/gutenprint/html/globals_0x64.html
index 1b2915e..5dfedeb 100644
--- a/doc/gutenprint/html/globals_0x64.html
+++ b/doc/gutenprint/html/globals_0x64.html
@@ -2,21 +2,57 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindexHL" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li id="current"><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>dcgettext
-: <a class="el" href="group__intl.html#ga3">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga3">gutenprint-intl-internal.h</a><li>dgettext
-: <a class="el" href="group__intl.html#ga2">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga2">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#g52d955a76a73f0e86dddd07dda5cd490">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#g52d955a76a73f0e86dddd07dda5cd490">gutenprint-intl-internal.h</a><li>dgettext
+: <a class="el" href="group__intl.html#g7fd6ec2ffaa95339754232b69eaac521">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#g7fd6ec2ffaa95339754232b69eaac521">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x67.html b/doc/gutenprint/html/globals_0x67.html
index a494c79..2353e63 100644
--- a/doc/gutenprint/html/globals_0x67.html
+++ b/doc/gutenprint/html/globals_0x67.html
@@ -2,20 +2,56 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindexHL" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li id="current"><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
-: <a class="el" href="group__intl.html#ga1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga1">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#geb8333d9b46653f2047c603034d26730">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#geb8333d9b46653f2047c603034d26730">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x6e.html b/doc/gutenprint/html/globals_0x6e.html
index 33fb577..041adba 100644
--- a/doc/gutenprint/html/globals_0x6e.html
+++ b/doc/gutenprint/html/globals_0x6e.html
@@ -2,20 +2,56 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindexHL" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li id="current"><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>N_
-: <a class="el" href="group__intl.html#ga6">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga6">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#g9de9caf5267f08d8164404a1f68b66f5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#g9de9caf5267f08d8164404a1f68b66f5">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x70.html b/doc/gutenprint/html/globals_0x70.html
index a3947d4..5e4d81b 100644
--- a/doc/gutenprint/html/globals_0x70.html
+++ b/doc/gutenprint/html/globals_0x70.html
@@ -2,26 +2,62 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindexHL" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li id="current"><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>PAPERSIZE_ENGLISH_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a2">paper.h</a><li>PAPERSIZE_ENGLISH_STANDARD
-: <a class="el" href="group__papersize.html#gga5a0">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a3">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
-: <a class="el" href="group__papersize.html#gga5a1">paper.h</a><li>PARAMETER_BAD
-: <a class="el" href="group__vars.html#gga136a33">vars.h</a><li>PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga136a35">vars.h</a><li>PARAMETER_OK
-: <a class="el" href="group__vars.html#gga136a34">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d">paper.h</a><li>PAPERSIZE_ENGLISH_STANDARD
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35">paper.h</a><li>PARAMETER_BAD
+: <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25">vars.h</a><li>PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9">vars.h</a><li>PARAMETER_OK
+: <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333">vars.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x73.html b/doc/gutenprint/html/globals_0x73.html
index 67e1c6b..473ee69 100644
--- a/doc/gutenprint/html/globals_0x73.html
+++ b/doc/gutenprint/html/globals_0x73.html
@@ -2,645 +2,681 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindexHL" href="globals_0x73.html#index_s">s</a> | <a class="qindex" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li id="current"><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
-: <a class="el" href="group__util.html#ga3">util.h</a><li>stp_allocate_component_data()
-: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_array_copy()
-: <a class="el" href="group__array.html#ga3">array.h</a><li>stp_array_create()
-: <a class="el" href="group__array.html#ga1">array.h</a><li>stp_array_create_copy()
-: <a class="el" href="group__array.html#ga4">array.h</a><li>stp_array_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a19">xml.h</a><li>stp_array_destroy()
-: <a class="el" href="group__array.html#ga2">array.h</a><li>stp_array_get_data()
-: <a class="el" href="group__array.html#ga8">array.h</a><li>stp_array_get_point()
-: <a class="el" href="group__array.html#ga10">array.h</a><li>stp_array_get_sequence()
-: <a class="el" href="group__array.html#ga11">array.h</a><li>stp_array_get_size()
-: <a class="el" href="group__array.html#ga6">array.h</a><li>stp_array_set_data()
-: <a class="el" href="group__array.html#ga7">array.h</a><li>stp_array_set_point()
-: <a class="el" href="group__array.html#ga9">array.h</a><li>stp_array_set_size()
-: <a class="el" href="group__array.html#ga5">array.h</a><li>stp_array_t
-: <a class="el" href="group__array.html#ga0">array.h</a><li>stp_asprintf()
-: <a class="el" href="group__util.html#ga17">util.h</a><li>STP_BINARY_AGE
-: <a class="el" href="group__version.html#ga11">gutenprint-version.h</a><li>stp_binary_age
-: <a class="el" href="group__version.html#ga4">gutenprint-version.h</a><li>stp_catprintf()
-: <a class="el" href="group__util.html#ga18">util.h</a><li>stp_channel_add()
-: <a class="el" href="channel_8h.html#a2">channel.h</a><li>stp_channel_convert()
-: <a class="el" href="channel_8h.html#a21">channel.h</a><li>stp_channel_get_black_channel()
-: <a class="el" href="channel_8h.html#a11">channel.h</a><li>stp_channel_get_curve()
-: <a class="el" href="channel_8h.html#a17">channel.h</a><li>stp_channel_get_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a9">channel.h</a><li>stp_channel_get_density_adjustment()
-: <a class="el" href="channel_8h.html#a5">channel.h</a><li>stp_channel_get_gcr_curve()
-: <a class="el" href="channel_8h.html#a19">channel.h</a><li>stp_channel_get_gloss_channel()
-: <a class="el" href="channel_8h.html#a13">channel.h</a><li>stp_channel_get_gloss_limit()
-: <a class="el" href="channel_8h.html#a15">channel.h</a><li>stp_channel_get_ink_limit()
-: <a class="el" href="channel_8h.html#a7">channel.h</a><li>stp_channel_get_input()
-: <a class="el" href="channel_8h.html#a22">channel.h</a><li>stp_channel_get_output()
-: <a class="el" href="channel_8h.html#a23">channel.h</a><li>stp_channel_get_value()
-: <a class="el" href="channel_8h.html#a3">channel.h</a><li>stp_channel_initialize()
-: <a class="el" href="channel_8h.html#a20">channel.h</a><li>STP_CHANNEL_LIMIT
-: <a class="el" href="group__image.html#ga16">image.h</a><li>stp_channel_reset()
-: <a class="el" href="channel_8h.html#a0">channel.h</a><li>stp_channel_reset_channel()
-: <a class="el" href="channel_8h.html#a1">channel.h</a><li>stp_channel_set_black_channel()
-: <a class="el" href="channel_8h.html#a10">channel.h</a><li>stp_channel_set_curve()
-: <a class="el" href="channel_8h.html#a16">channel.h</a><li>stp_channel_set_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a8">channel.h</a><li>stp_channel_set_density_adjustment()
-: <a class="el" href="channel_8h.html#a4">channel.h</a><li>stp_channel_set_gcr_curve()
-: <a class="el" href="channel_8h.html#a18">channel.h</a><li>stp_channel_set_gloss_channel()
-: <a class="el" href="channel_8h.html#a12">channel.h</a><li>stp_channel_set_gloss_limit()
-: <a class="el" href="channel_8h.html#a14">channel.h</a><li>stp_channel_set_ink_limit()
-: <a class="el" href="channel_8h.html#a6">channel.h</a><li>stp_check_array_parameter()
-: <a class="el" href="group__vars.html#ga107">vars.h</a><li>stp_check_boolean_parameter()
-: <a class="el" href="group__vars.html#ga105">vars.h</a><li>stp_check_curve_parameter()
-: <a class="el" href="group__vars.html#ga106">vars.h</a><li>stp_check_dimension_parameter()
-: <a class="el" href="group__vars.html#ga104">vars.h</a><li>stp_check_file_parameter()
-: <a class="el" href="group__vars.html#ga101">vars.h</a><li>stp_check_float_parameter()
-: <a class="el" href="group__vars.html#ga102">vars.h</a><li>stp_check_int_parameter()
-: <a class="el" href="group__vars.html#ga103">vars.h</a><li>stp_check_raw_parameter()
-: <a class="el" href="group__vars.html#ga108">vars.h</a><li>stp_check_string_parameter()
-: <a class="el" href="group__vars.html#ga100">vars.h</a><li>stp_check_version()
-: <a class="el" href="group__version.html#ga6">gutenprint-version.h</a><li>STP_CHECK_VERSION
-: <a class="el" href="group__version.html#ga13">gutenprint-version.h</a><li>stp_clear_array_parameter()
-: <a class="el" href="group__vars.html#ga89">vars.h</a><li>stp_clear_boolean_parameter()
-: <a class="el" href="group__vars.html#ga87">vars.h</a><li>stp_clear_curve_parameter()
-: <a class="el" href="group__vars.html#ga88">vars.h</a><li>stp_clear_dimension_parameter()
-: <a class="el" href="group__vars.html#ga86">vars.h</a><li>stp_clear_file_parameter()
-: <a class="el" href="group__vars.html#ga83">vars.h</a><li>stp_clear_float_parameter()
-: <a class="el" href="group__vars.html#ga84">vars.h</a><li>stp_clear_int_parameter()
-: <a class="el" href="group__vars.html#ga85">vars.h</a><li>stp_clear_raw_parameter()
-: <a class="el" href="group__vars.html#ga90">vars.h</a><li>stp_clear_string_parameter()
-: <a class="el" href="group__vars.html#ga82">vars.h</a><li>stp_color_count()
-: <a class="el" href="group__color.html#ga12">color.h</a><li>stp_color_describe_parameter()
-: <a class="el" href="group__color.html#ga9">color.h</a><li>stp_color_get_long_name()
-: <a class="el" href="group__color.html#ga17">color.h</a><li>stp_color_get_name()
-: <a class="el" href="group__color.html#ga16">color.h</a><li>stp_color_get_row()
-: <a class="el" href="group__color.html#ga7">color.h</a><li>stp_color_init()
-: <a class="el" href="group__color.html#ga6">color.h</a><li>stp_color_list_parameters()
-: <a class="el" href="group__color.html#ga8">color.h</a><li>stp_color_register()
-: <a class="el" href="group__color.html#ga10">color.h</a><li>stp_color_t
-: <a class="el" href="group__color.html#ga5">color.h</a><li>stp_color_unregister()
-: <a class="el" href="group__color.html#ga11">color.h</a><li>stp_compute_linewidth_func
-: <a class="el" href="weave_8h.html#a4">weave.h</a><li>stp_compute_tiff_linewidth
-: <a class="el" href="weave_8h.html#a9">weave.h</a><li>stp_compute_uncompressed_linewidth
-: <a class="el" href="weave_8h.html#a10">weave.h</a><li>stp_const_parameter_list_t
-: <a class="el" href="group__vars.html#ga2">vars.h</a><li>stp_copy_data_func_t
-: <a class="el" href="group__vars.html#ga4">vars.h</a><li>stp_copy_options()
-: <a class="el" href="group__vars.html#ga130">vars.h</a><li>STP_CURRENT_INTERFACE
-: <a class="el" href="group__version.html#ga10">gutenprint-version.h</a><li>stp_current_interface
-: <a class="el" href="group__version.html#ga3">gutenprint-version.h</a><li>STP_CURVE_BOUNDS_CLIP
-: <a class="el" href="group__curve.html#gga50a9">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
-: <a class="el" href="group__curve.html#gga50a10">curve.h</a><li>STP_CURVE_BOUNDS_RESCALE
-: <a class="el" href="group__curve.html#gga50a8">curve.h</a><li>stp_curve_bounds_t
-: <a class="el" href="group__curve.html#ga50">curve.h</a><li>stp_curve_cache_copy()
-: <a class="el" href="curve-cache_8h.html#a12">curve-cache.h</a><li>stp_curve_cache_curve_data()
-: <a class="el" href="curve-cache_8h.html#a4">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
-: <a class="el" href="curve-cache_8h.html#a6">curve-cache.h</a><li>stp_curve_cache_get_count()
-: <a class="el" href="curve-cache_8h.html#a9">curve-cache.h</a><li>stp_curve_cache_get_curve()
-: <a class="el" href="curve-cache_8h.html#a5">curve-cache.h</a><li>stp_curve_cache_get_double_data()
-: <a class="el" href="curve-cache_8h.html#a11">curve-cache.h</a><li>stp_curve_cache_get_ushort_data()
-: <a class="el" href="curve-cache_8h.html#a10">curve-cache.h</a><li>stp_curve_cache_set_curve()
-: <a class="el" href="curve-cache_8h.html#a7">curve-cache.h</a><li>stp_curve_cache_set_curve_copy()
-: <a class="el" href="curve-cache_8h.html#a8">curve-cache.h</a><li>stp_curve_compose()
-: <a class="el" href="group__curve.html#ga46">curve.h</a><li>STP_CURVE_COMPOSE_ADD
-: <a class="el" href="group__curve.html#gga49a5">curve.h</a><li>STP_CURVE_COMPOSE_EXPONENTIATE
-: <a class="el" href="group__curve.html#gga49a7">curve.h</a><li>STP_CURVE_COMPOSE_MULTIPLY
-: <a class="el" href="group__curve.html#gga49a6">curve.h</a><li>stp_curve_compose_t
-: <a class="el" href="group__curve.html#ga49">curve.h</a><li>stp_curve_copy()
-: <a class="el" href="group__curve.html#ga3">curve.h</a><li>stp_curve_count_points()
-: <a class="el" href="group__curve.html#ga10">curve.h</a><li>stp_curve_create()
-: <a class="el" href="group__curve.html#ga1">curve.h</a><li>stp_curve_create_copy()
-: <a class="el" href="group__curve.html#ga2">curve.h</a><li>stp_curve_create_from_file()
-: <a class="el" href="group__curve.html#ga44">curve.h</a><li>stp_curve_create_from_stream()
-: <a class="el" href="group__curve.html#ga43">curve.h</a><li>stp_curve_create_from_string()
-: <a class="el" href="group__curve.html#ga45">curve.h</a><li>stp_curve_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a17">xml.h</a><li>stp_curve_destroy()
-: <a class="el" href="group__curve.html#ga4">curve.h</a><li>stp_curve_free_curve_cache()
-: <a class="el" href="curve-cache_8h.html#a3">curve-cache.h</a><li>stp_curve_get_bounds()
-: <a class="el" href="group__curve.html#ga6">curve.h</a><li>stp_curve_get_data()
-: <a class="el" href="group__curve.html#ga24">curve.h</a><li>stp_curve_get_data_points()
-: <a class="el" href="group__curve.html#ga25">curve.h</a><li>stp_curve_get_float_data()
-: <a class="el" href="group__curve.html#ga26">curve.h</a><li>stp_curve_get_gamma()
-: <a class="el" href="group__curve.html#ga35">curve.h</a><li>stp_curve_get_int_data()
-: <a class="el" href="group__curve.html#ga29">curve.h</a><li>stp_curve_get_interpolation_type()
-: <a class="el" href="group__curve.html#ga12">curve.h</a><li>stp_curve_get_long_data()
-: <a class="el" href="group__curve.html#ga27">curve.h</a><li>stp_curve_get_point()
-: <a class="el" href="group__curve.html#ga37">curve.h</a><li>stp_curve_get_range()
-: <a class="el" href="group__curve.html#ga9">curve.h</a><li>stp_curve_get_sequence()
-: <a class="el" href="group__curve.html#ga33">curve.h</a><li>stp_curve_get_short_data()
-: <a class="el" href="group__curve.html#ga31">curve.h</a><li>stp_curve_get_subrange()
-: <a class="el" href="group__curve.html#ga22">curve.h</a><li>stp_curve_get_uint_data()
-: <a class="el" href="group__curve.html#ga30">curve.h</a><li>stp_curve_get_ulong_data()
-: <a class="el" href="group__curve.html#ga28">curve.h</a><li>stp_curve_get_ushort_data()
-: <a class="el" href="group__curve.html#ga32">curve.h</a><li>stp_curve_get_wrap()
-: <a class="el" href="group__curve.html#ga7">curve.h</a><li>stp_curve_interpolate_value()
-: <a class="el" href="group__curve.html#ga38">curve.h</a><li>stp_curve_is_piecewise()
-: <a class="el" href="group__curve.html#ga8">curve.h</a><li>stp_curve_resample()
-: <a class="el" href="group__curve.html#ga39">curve.h</a><li>stp_curve_rescale()
-: <a class="el" href="group__curve.html#ga40">curve.h</a><li>stp_curve_set_bounds()
-: <a class="el" href="group__curve.html#ga5">curve.h</a><li>stp_curve_set_data()
-: <a class="el" href="group__curve.html#ga13">curve.h</a><li>stp_curve_set_data_points()
-: <a class="el" href="group__curve.html#ga14">curve.h</a><li>stp_curve_set_float_data()
-: <a class="el" href="group__curve.html#ga15">curve.h</a><li>stp_curve_set_gamma()
-: <a class="el" href="group__curve.html#ga34">curve.h</a><li>stp_curve_set_int_data()
-: <a class="el" href="group__curve.html#ga18">curve.h</a><li>stp_curve_set_interpolation_type()
-: <a class="el" href="group__curve.html#ga11">curve.h</a><li>stp_curve_set_long_data()
-: <a class="el" href="group__curve.html#ga16">curve.h</a><li>stp_curve_set_point()
-: <a class="el" href="group__curve.html#ga36">curve.h</a><li>stp_curve_set_short_data()
-: <a class="el" href="group__curve.html#ga20">curve.h</a><li>stp_curve_set_subrange()
-: <a class="el" href="group__curve.html#ga23">curve.h</a><li>stp_curve_set_uint_data()
-: <a class="el" href="group__curve.html#ga19">curve.h</a><li>stp_curve_set_ulong_data()
-: <a class="el" href="group__curve.html#ga17">curve.h</a><li>stp_curve_set_ushort_data()
-: <a class="el" href="group__curve.html#ga21">curve.h</a><li>stp_curve_t
-: <a class="el" href="group__curve.html#ga0">curve.h</a><li>STP_CURVE_TYPE_LINEAR
-: <a class="el" href="group__curve.html#gga47a1">curve.h</a><li>STP_CURVE_TYPE_SPLINE
-: <a class="el" href="group__curve.html#gga47a2">curve.h</a><li>stp_curve_type_t
-: <a class="el" href="group__curve.html#ga47">curve.h</a><li>STP_CURVE_WRAP_AROUND
-: <a class="el" href="group__curve.html#gga48a4">curve.h</a><li>stp_curve_wrap_mode_t
-: <a class="el" href="group__curve.html#ga48">curve.h</a><li>STP_CURVE_WRAP_NONE
-: <a class="el" href="group__curve.html#gga48a3">curve.h</a><li>stp_curve_write()
-: <a class="el" href="group__curve.html#ga41">curve.h</a><li>stp_curve_write_string()
-: <a class="el" href="group__curve.html#ga42">curve.h</a><li>STP_DBG_CANON
-: <a class="el" href="group__util.html#ga39">util.h</a><li>STP_DBG_COLORFUNC
-: <a class="el" href="group__util.html#ga34">util.h</a><li>STP_DBG_CURVE
-: <a class="el" href="group__util.html#ga52">util.h</a><li>STP_DBG_CURVE_ERRORS
-: <a class="el" href="group__util.html#ga53">util.h</a><li>STP_DBG_ESCP2
-: <a class="el" href="group__util.html#ga38">util.h</a><li>STP_DBG_INK
-: <a class="el" href="group__util.html#ga35">util.h</a><li>STP_DBG_LEXMARK
-: <a class="el" href="group__util.html#ga40">util.h</a><li>STP_DBG_LIST
-: <a class="el" href="group__util.html#ga44">util.h</a><li>STP_DBG_LUT
-: <a class="el" href="group__util.html#ga33">util.h</a><li>STP_DBG_MARK_FILE
-: <a class="el" href="group__util.html#ga43">util.h</a><li>STP_DBG_MODULE
-: <a class="el" href="group__util.html#ga45">util.h</a><li>STP_DBG_OLYMPUS
-: <a class="el" href="group__util.html#ga51">util.h</a><li>STP_DBG_PAPER
-: <a class="el" href="group__util.html#ga47">util.h</a><li>STP_DBG_PATH
-: <a class="el" href="group__util.html#ga46">util.h</a><li>STP_DBG_PCL
-: <a class="el" href="group__util.html#ga37">util.h</a><li>STP_DBG_PRINTERS
-: <a class="el" href="group__util.html#ga48">util.h</a><li>STP_DBG_PS
-: <a class="el" href="group__util.html#ga36">util.h</a><li>STP_DBG_ROWS
-: <a class="el" href="group__util.html#ga42">util.h</a><li>STP_DBG_VARS
-: <a class="el" href="group__util.html#ga50">util.h</a><li>STP_DBG_WEAVE_PARAMS
-: <a class="el" href="group__util.html#ga41">util.h</a><li>STP_DBG_XML
-: <a class="el" href="group__util.html#ga49">util.h</a><li>stp_default_media_size()
-: <a class="el" href="group__papersize.html#ga4">paper.h</a><li>stp_default_settings()
-: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_deprintf()
-: <a class="el" href="group__util.html#ga21">util.h</a><li>stp_describe_output()
-: <a class="el" href="group__printer.html#ga25">printers.h</a><li>stp_describe_parameter()
-: <a class="el" href="group__vars.html#ga47">vars.h</a><li>stp_describe_resolution()
-: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_destroy_component_data()
-: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_dither()
-: <a class="el" href="dither_8h.html#a40">dither.h</a><li>stp_dither_add_channel()
-: <a class="el" href="dither_8h.html#a38">dither.h</a><li>stp_dither_describe_parameter()
-: <a class="el" href="dither_8h.html#a24">dither.h</a><li>stp_dither_get_channel()
-: <a class="el" href="dither_8h.html#a39">dither.h</a><li>stp_dither_get_first_position()
-: <a class="el" href="dither_8h.html#a33">dither.h</a><li>stp_dither_get_last_position()
-: <a class="el" href="dither_8h.html#a34">dither.h</a><li>stp_dither_init()
-: <a class="el" href="dither_8h.html#a25">dither.h</a><li>stp_dither_internal()
-: <a class="el" href="dither_8h.html#a41">dither.h</a><li>stp_dither_list_parameters()
-: <a class="el" href="dither_8h.html#a23">dither.h</a><li>stp_dither_matrix_clone()
-: <a class="el" href="dither_8h.html#a18">dither.h</a><li>stp_dither_matrix_copy()
-: <a class="el" href="dither_8h.html#a19">dither.h</a><li>stp_dither_matrix_destroy()
-: <a class="el" href="dither_8h.html#a17">dither.h</a><li>stp_dither_matrix_generic_t
-: <a class="el" href="dither_8h.html#a7">dither.h</a><li>stp_dither_matrix_impl_t
-: <a class="el" href="dither_8h.html#a8">dither.h</a><li>stp_dither_matrix_init()
-: <a class="el" href="dither_8h.html#a13">dither.h</a><li>stp_dither_matrix_init_from_dither_array()
-: <a class="el" href="dither_8h.html#a16">dither.h</a><li>stp_dither_matrix_init_short()
-: <a class="el" href="dither_8h.html#a14">dither.h</a><li>stp_dither_matrix_iterated_init()
-: <a class="el" href="dither_8h.html#a11">dither.h</a><li>stp_dither_matrix_normal_t
-: <a class="el" href="dither_8h.html#a6">dither.h</a><li>stp_dither_matrix_scale_exponentially()
-: <a class="el" href="dither_8h.html#a20">dither.h</a><li>stp_dither_matrix_set_row()
-: <a class="el" href="dither_8h.html#a21">dither.h</a><li>stp_dither_matrix_shear()
-: <a class="el" href="dither_8h.html#a12">dither.h</a><li>stp_dither_matrix_short_t
-: <a class="el" href="dither_8h.html#a5">dither.h</a><li>stp_dither_matrix_validate_array()
-: <a class="el" href="dither_8h.html#a15">dither.h</a><li>stp_dither_set_adaptive_limit()
-: <a class="el" href="dither_8h.html#a32">dither.h</a><li>stp_dither_set_ink_spread()
-: <a class="el" href="dither_8h.html#a31">dither.h</a><li>stp_dither_set_inks()
-: <a class="el" href="dither_8h.html#a37">dither.h</a><li>stp_dither_set_inks_full()
-: <a class="el" href="dither_8h.html#a36">dither.h</a><li>stp_dither_set_inks_simple()
-: <a class="el" href="dither_8h.html#a35">dither.h</a><li>stp_dither_set_iterated_matrix()
-: <a class="el" href="dither_8h.html#a26">dither.h</a><li>stp_dither_set_matrix()
-: <a class="el" href="dither_8h.html#a27">dither.h</a><li>stp_dither_set_matrix_from_dither_array()
-: <a class="el" href="dither_8h.html#a28">dither.h</a><li>stp_dither_set_randomizer()
-: <a class="el" href="dither_8h.html#a30">dither.h</a><li>stp_dither_set_transition()
-: <a class="el" href="dither_8h.html#a29">dither.h</a><li>stp_dotsize_t
-: <a class="el" href="dither_8h.html#a9">dither.h</a><li>stp_dprintf()
-: <a class="el" href="group__util.html#ga20">util.h</a><li>STP_ECOLOR_C
-: <a class="el" href="dither_8h.html#a1">dither.h</a><li>STP_ECOLOR_K
-: <a class="el" href="dither_8h.html#a0">dither.h</a><li>STP_ECOLOR_M
-: <a class="el" href="dither_8h.html#a2">dither.h</a><li>STP_ECOLOR_Y
-: <a class="el" href="dither_8h.html#a3">dither.h</a><li>stp_end_job()
-: <a class="el" href="group__printer.html#ga17">printers.h</a><li>stp_eprintf()
-: <a class="el" href="group__util.html#ga15">util.h</a><li>stp_erprintf()
-: <a class="el" href="group__util.html#ga16">util.h</a><li>stp_erputc()
-: <a class="el" href="group__util.html#ga14">util.h</a><li>stp_family_register()
-: <a class="el" href="group__printer.html#ga20">printers.h</a><li>stp_family_t
-: <a class="el" href="group__printer.html#ga1">printers.h</a><li>stp_family_unregister()
-: <a class="el" href="group__printer.html#ga21">printers.h</a><li>stp_fill_parameter_settings()
-: <a class="el" href="group__vars.html#ga131">vars.h</a><li>stp_fill_tiff
-: <a class="el" href="weave_8h.html#a7">weave.h</a><li>stp_fill_uncompressed
-: <a class="el" href="weave_8h.html#a8">weave.h</a><li>stp_fillfunc
-: <a class="el" href="weave_8h.html#a2">weave.h</a><li>stp_find_standard_dither_array()
-: <a class="el" href="dither_8h.html#a22">dither.h</a><li>stp_flush_all()
-: <a class="el" href="weave_8h.html#a18">weave.h</a><li>stp_flush_debug_messages()
-: <a class="el" href="group__util.html#ga23">util.h</a><li>stp_flushfunc
-: <a class="el" href="weave_8h.html#a3">weave.h</a><li>stp_fold()
-: <a class="el" href="bit-ops_8h.html#a0">bit-ops.h</a><li>stp_free()
-: <a class="el" href="group__util.html#ga27">util.h</a><li>stp_free_data_func_t
-: <a class="el" href="group__vars.html#ga5">vars.h</a><li>stp_get_array_parameter()
-: <a class="el" href="group__vars.html#ga80">vars.h</a><li>stp_get_array_parameter_active()
-: <a class="el" href="group__vars.html#ga116">vars.h</a><li>stp_get_boolean_parameter()
-: <a class="el" href="group__vars.html#ga78">vars.h</a><li>stp_get_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga114">vars.h</a><li>stp_get_color_by_colorfuncs()
-: <a class="el" href="group__color.html#ga15">color.h</a><li>stp_get_color_by_index()
-: <a class="el" href="group__color.html#ga14">color.h</a><li>stp_get_color_by_name()
-: <a class="el" href="group__color.html#ga13">color.h</a><li>stp_get_color_conversion()
-: <a class="el" href="group__vars.html#ga16">vars.h</a><li>stp_get_component_data()
-: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_get_curve_parameter()
-: <a class="el" href="group__vars.html#ga79">vars.h</a><li>stp_get_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga115">vars.h</a><li>stp_get_debug_level()
-: <a class="el" href="group__util.html#ga19">util.h</a><li>stp_get_dimension_parameter()
-: <a class="el" href="group__vars.html#ga77">vars.h</a><li>stp_get_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga113">vars.h</a><li>stp_get_driver()
-: <a class="el" href="group__vars.html#ga13">vars.h</a><li>stp_get_errdata()
-: <a class="el" href="group__vars.html#ga36">vars.h</a><li>stp_get_errfunc()
-: <a class="el" href="group__vars.html#ga32">vars.h</a><li>stp_get_file_parameter()
-: <a class="el" href="group__vars.html#ga74">vars.h</a><li>stp_get_file_parameter_active()
-: <a class="el" href="group__vars.html#ga110">vars.h</a><li>stp_get_float_parameter()
-: <a class="el" href="group__vars.html#ga75">vars.h</a><li>stp_get_float_parameter_active()
-: <a class="el" href="group__vars.html#ga111">vars.h</a><li>stp_get_height()
-: <a class="el" href="group__vars.html#ga24">vars.h</a><li>stp_get_imageable_area()
-: <a class="el" href="group__vars.html#ga119">vars.h</a><li>stp_get_int_parameter()
-: <a class="el" href="group__vars.html#ga76">vars.h</a><li>stp_get_int_parameter_active()
-: <a class="el" href="group__vars.html#ga112">vars.h</a><li>stp_get_left()
-: <a class="el" href="group__vars.html#ga18">vars.h</a><li>stp_get_lineactive_by_pass()
-: <a class="el" href="weave_8h.html#a21">weave.h</a><li>stp_get_linebases_by_pass()
-: <a class="el" href="weave_8h.html#a23">weave.h</a><li>stp_get_linecount_by_pass()
-: <a class="el" href="weave_8h.html#a22">weave.h</a><li>stp_get_lineoffsets_by_pass()
-: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_media_size()
-: <a class="el" href="group__vars.html#ga118">vars.h</a><li>stp_get_model_id()
-: <a class="el" href="group__printer.html#ga18">printers.h</a><li>stp_get_outdata()
-: <a class="el" href="group__vars.html#ga34">vars.h</a><li>stp_get_outfunc()
-: <a class="el" href="group__vars.html#ga30">vars.h</a><li>stp_get_page_height()
-: <a class="el" href="group__vars.html#ga28">vars.h</a><li>stp_get_page_width()
-: <a class="el" href="group__vars.html#ga26">vars.h</a><li>stp_get_papersize_by_index()
-: <a class="el" href="group__papersize.html#ga3">paper.h</a><li>stp_get_papersize_by_name()
-: <a class="el" href="group__papersize.html#ga1">paper.h</a><li>stp_get_papersize_by_size()
-: <a class="el" href="group__papersize.html#ga2">paper.h</a><li>stp_get_parameter_list()
-: <a class="el" href="group__vars.html#ga38">vars.h</a><li>stp_get_pass_by_pass()
-: <a class="el" href="weave_8h.html#a24">weave.h</a><li>stp_get_printer()
-: <a class="el" href="group__printer.html#ga6">printers.h</a><li>stp_get_printer_by_driver()
-: <a class="el" href="group__printer.html#ga5">printers.h</a><li>stp_get_printer_by_index()
-: <a class="el" href="group__printer.html#ga3">printers.h</a><li>stp_get_printer_by_long_name()
-: <a class="el" href="group__printer.html#ga4">printers.h</a><li>stp_get_printer_index_by_driver()
-: <a class="el" href="group__printer.html#ga7">printers.h</a><li>stp_get_raw_parameter()
-: <a class="el" href="group__vars.html#ga81">vars.h</a><li>stp_get_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga117">vars.h</a><li>stp_get_release_version()
-: <a class="el" href="group__util.html#ga32">util.h</a><li>stp_get_size_limit()
-: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_string_parameter()
-: <a class="el" href="group__vars.html#ga73">vars.h</a><li>stp_get_string_parameter_active()
-: <a class="el" href="group__vars.html#ga109">vars.h</a><li>stp_get_top()
-: <a class="el" href="group__vars.html#ga20">vars.h</a><li>stp_get_verified()
-: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_get_version()
-: <a class="el" href="group__util.html#ga31">util.h</a><li>stp_get_width()
-: <a class="el" href="group__vars.html#ga22">vars.h</a><li>stp_image_conclude()
-: <a class="el" href="group__image.html#ga15">image.h</a><li>stp_image_get_appname()
-: <a class="el" href="group__image.html#ga14">image.h</a><li>stp_image_get_row()
-: <a class="el" href="group__image.html#ga13">image.h</a><li>stp_image_height()
-: <a class="el" href="group__image.html#ga12">image.h</a><li>stp_image_init()
-: <a class="el" href="group__image.html#ga9">image.h</a><li>stp_image_reset()
-: <a class="el" href="group__image.html#ga10">image.h</a><li>STP_IMAGE_STATUS_ABORT
-: <a class="el" href="group__image.html#gga17a8">image.h</a><li>STP_IMAGE_STATUS_OK
-: <a class="el" href="group__image.html#gga17a2">image.h</a><li>stp_image_status_t
-: <a class="el" href="group__image.html#ga17">image.h</a><li>stp_image_t
-: <a class="el" href="group__image.html#ga7">image.h</a><li>stp_image_width()
-: <a class="el" href="group__image.html#ga11">image.h</a><li>stp_init()
-: <a class="el" href="group__util.html#ga0">util.h</a><li>stp_init_debug_messages()
-: <a class="el" href="group__util.html#ga22">util.h</a><li>stp_initialize_printer_defaults()
-: <a class="el" href="group__printer.html#ga22">printers.h</a><li>stp_initialize_weave()
-: <a class="el" href="weave_8h.html#a17">weave.h</a><li>stp_interface_age
-: <a class="el" href="group__version.html#ga5">gutenprint-version.h</a><li>STP_INTERFACE_AGE
-: <a class="el" href="group__version.html#ga12">gutenprint-version.h</a><li>stp_known_papersizes()
-: <a class="el" href="group__papersize.html#ga0">paper.h</a><li>stp_list_copy()
-: <a class="el" href="group__list.html#ga8">list.h</a><li>stp_list_create()
-: <a class="el" href="group__list.html#ga7">list.h</a><li>stp_list_destroy()
-: <a class="el" href="group__list.html#ga9">list.h</a><li>stp_list_get_copyfunc()
-: <a class="el" href="group__list.html#ga19">list.h</a><li>stp_list_get_end()
-: <a class="el" href="group__list.html#ga11">list.h</a><li>stp_list_get_freefunc()
-: <a class="el" href="group__list.html#ga17">list.h</a><li>stp_list_get_item_by_index()
-: <a class="el" href="group__list.html#ga12">list.h</a><li>stp_list_get_item_by_long_name()
-: <a class="el" href="group__list.html#ga14">list.h</a><li>stp_list_get_item_by_name()
-: <a class="el" href="group__list.html#ga13">list.h</a><li>stp_list_get_length()
-: <a class="el" href="group__list.html#ga15">list.h</a><li>stp_list_get_long_namefunc()
-: <a class="el" href="group__list.html#ga23">list.h</a><li>stp_list_get_namefunc()
-: <a class="el" href="group__list.html#ga21">list.h</a><li>stp_list_get_sortfunc()
-: <a class="el" href="group__list.html#ga25">list.h</a><li>stp_list_get_start()
-: <a class="el" href="group__list.html#ga10">list.h</a><li>stp_list_item_create()
-: <a class="el" href="group__list.html#ga26">list.h</a><li>stp_list_item_destroy()
-: <a class="el" href="group__list.html#ga27">list.h</a><li>stp_list_item_get_data()
-: <a class="el" href="group__list.html#ga30">list.h</a><li>stp_list_item_next()
-: <a class="el" href="group__list.html#ga29">list.h</a><li>stp_list_item_prev()
-: <a class="el" href="group__list.html#ga28">list.h</a><li>stp_list_item_set_data()
-: <a class="el" href="group__list.html#ga31">list.h</a><li>stp_list_item_t
-: <a class="el" href="group__list.html#ga0">list.h</a><li>stp_list_node_free_data()
-: <a class="el" href="group__list.html#ga6">list.h</a><li>stp_list_set_copyfunc()
-: <a class="el" href="group__list.html#ga18">list.h</a><li>stp_list_set_freefunc()
-: <a class="el" href="group__list.html#ga16">list.h</a><li>stp_list_set_long_namefunc()
-: <a class="el" href="group__list.html#ga22">list.h</a><li>stp_list_set_namefunc()
-: <a class="el" href="group__list.html#ga20">list.h</a><li>stp_list_set_sortfunc()
-: <a class="el" href="group__list.html#ga24">list.h</a><li>stp_list_t
-: <a class="el" href="group__list.html#ga1">list.h</a><li>STP_MAJOR_VERSION
-: <a class="el" href="group__version.html#ga7">gutenprint-version.h</a><li>stp_major_version
-: <a class="el" href="group__version.html#ga0">gutenprint-version.h</a><li>stp_malloc()
-: <a class="el" href="group__util.html#ga24">util.h</a><li>STP_MAX_WEAVE
-: <a class="el" href="weave_8h.html#a0">weave.h</a><li>stp_merge_printvars()
-: <a class="el" href="group__vars.html#ga37">vars.h</a><li>STP_MICRO_VERSION
-: <a class="el" href="group__version.html#ga9">gutenprint-version.h</a><li>stp_micro_version
-: <a class="el" href="group__version.html#ga2">gutenprint-version.h</a><li>stp_minor_version
-: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>STP_MINOR_VERSION
-: <a class="el" href="group__version.html#ga8">gutenprint-version.h</a><li>STP_MODULE
-: <a class="el" href="gutenprint-module_8h.html#a0">gutenprint-module.h</a><li>STP_MODULE_CLASS_COLOR
-: <a class="el" href="module_8h.html#a13a5">module.h</a><li>STP_MODULE_CLASS_DITHER
-: <a class="el" href="module_8h.html#a13a6">module.h</a><li>STP_MODULE_CLASS_FAMILY
-: <a class="el" href="module_8h.html#a13a4">module.h</a><li>STP_MODULE_CLASS_INVALID
-: <a class="el" href="module_8h.html#a13a2">module.h</a><li>STP_MODULE_CLASS_MISC
-: <a class="el" href="module_8h.html#a13a3">module.h</a><li>stp_module_class_t
-: <a class="el" href="module_8h.html#a13">module.h</a><li>stp_module_close()
-: <a class="el" href="module_8h.html#a11">module.h</a><li>stp_module_exit()
-: <a class="el" href="module_8h.html#a8">module.h</a><li>stp_module_get_class()
-: <a class="el" href="module_8h.html#a12">module.h</a><li>stp_module_init()
-: <a class="el" href="module_8h.html#a10">module.h</a><li>stp_module_load()
-: <a class="el" href="module_8h.html#a7">module.h</a><li>stp_module_open()
-: <a class="el" href="module_8h.html#a9">module.h</a><li>stp_module_t
-: <a class="el" href="module_8h.html#a1">module.h</a><li>stp_module_version_t
-: <a class="el" href="module_8h.html#a0">module.h</a><li>STP_MXML_ADD_AFTER
-: <a class="el" href="mxml_8h.html#a12">mxml.h</a><li>STP_MXML_ADD_BEFORE
-: <a class="el" href="mxml_8h.html#a11">mxml.h</a><li>STP_MXML_ADD_TO_PARENT
-: <a class="el" href="mxml_8h.html#a13">mxml.h</a><li>stp_mxml_attr_t
-: <a class="el" href="mxml_8h.html#a15">mxml.h</a><li>STP_MXML_DESCEND
-: <a class="el" href="mxml_8h.html#a4">mxml.h</a><li>STP_MXML_DESCEND_FIRST
-: <a class="el" href="mxml_8h.html#a6">mxml.h</a><li>STP_MXML_ELEMENT
-: <a class="el" href="mxml_8h.html#a43a20">mxml.h</a><li>stp_mxml_element_t
-: <a class="el" href="mxml_8h.html#a16">mxml.h</a><li>STP_MXML_INTEGER
-: <a class="el" href="mxml_8h.html#a43a21">mxml.h</a><li>STP_MXML_NO_CALLBACK
-: <a class="el" href="mxml_8h.html#a2">mxml.h</a><li>STP_MXML_NO_DESCEND
-: <a class="el" href="mxml_8h.html#a5">mxml.h</a><li>STP_MXML_NO_PARENT
-: <a class="el" href="mxml_8h.html#a3">mxml.h</a><li>stp_mxml_node_t
-: <a class="el" href="mxml_8h.html#a19">mxml.h</a><li>STP_MXML_OPAQUE
-: <a class="el" href="mxml_8h.html#a43a22">mxml.h</a><li>STP_MXML_REAL
-: <a class="el" href="mxml_8h.html#a43a23">mxml.h</a><li>STP_MXML_TAB
-: <a class="el" href="mxml_8h.html#a1">mxml.h</a><li>STP_MXML_TEXT
-: <a class="el" href="mxml_8h.html#a43a24">mxml.h</a><li>stp_mxml_text_t
-: <a class="el" href="mxml_8h.html#a17">mxml.h</a><li>stp_mxml_type_e
-: <a class="el" href="mxml_8h.html#a43">mxml.h</a><li>stp_mxml_type_t
-: <a class="el" href="mxml_8h.html#a14">mxml.h</a><li>stp_mxml_value_t
-: <a class="el" href="mxml_8h.html#a18">mxml.h</a><li>STP_MXML_WRAP
-: <a class="el" href="mxml_8h.html#a0">mxml.h</a><li>STP_MXML_WS_AFTER_CLOSE
-: <a class="el" href="mxml_8h.html#a10">mxml.h</a><li>STP_MXML_WS_AFTER_OPEN
-: <a class="el" href="mxml_8h.html#a8">mxml.h</a><li>STP_MXML_WS_BEFORE_CLOSE
-: <a class="el" href="mxml_8h.html#a9">mxml.h</a><li>STP_MXML_WS_BEFORE_OPEN
-: <a class="el" href="mxml_8h.html#a7">mxml.h</a><li>stp_mxmlAdd()
-: <a class="el" href="mxml_8h.html#a25">mxml.h</a><li>stp_mxmlDelete()
-: <a class="el" href="mxml_8h.html#a26">mxml.h</a><li>stp_mxmlElementGetAttr()
-: <a class="el" href="mxml_8h.html#a27">mxml.h</a><li>stp_mxmlElementSetAttr()
-: <a class="el" href="mxml_8h.html#a28">mxml.h</a><li>stp_mxmlFindElement()
-: <a class="el" href="mxml_8h.html#a29">mxml.h</a><li>stp_mxmlLoadFile()
-: <a class="el" href="mxml_8h.html#a30">mxml.h</a><li>stp_mxmlLoadString()
-: <a class="el" href="mxml_8h.html#a31">mxml.h</a><li>stp_mxmlNewElement()
-: <a class="el" href="mxml_8h.html#a32">mxml.h</a><li>stp_mxmlNewInteger()
-: <a class="el" href="mxml_8h.html#a33">mxml.h</a><li>stp_mxmlNewOpaque()
-: <a class="el" href="mxml_8h.html#a34">mxml.h</a><li>stp_mxmlNewReal()
-: <a class="el" href="mxml_8h.html#a35">mxml.h</a><li>stp_mxmlNewText()
-: <a class="el" href="mxml_8h.html#a36">mxml.h</a><li>stp_mxmlRemove()
-: <a class="el" href="mxml_8h.html#a37">mxml.h</a><li>stp_mxmlSaveAllocString()
-: <a class="el" href="mxml_8h.html#a38">mxml.h</a><li>stp_mxmlSaveFile()
-: <a class="el" href="mxml_8h.html#a39">mxml.h</a><li>stp_mxmlSaveString()
-: <a class="el" href="mxml_8h.html#a40">mxml.h</a><li>stp_mxmlWalkNext()
-: <a class="el" href="mxml_8h.html#a41">mxml.h</a><li>stp_mxmlWalkPrev()
-: <a class="el" href="mxml_8h.html#a42">mxml.h</a><li>STP_NCOLORS
-: <a class="el" href="dither_8h.html#a4">dither.h</a><li>stp_node_copyfunc
-: <a class="el" href="group__list.html#ga3">list.h</a><li>stp_node_freefunc
-: <a class="el" href="group__list.html#ga2">list.h</a><li>stp_node_namefunc
-: <a class="el" href="group__list.html#ga4">list.h</a><li>stp_node_sortfunc
-: <a class="el" href="group__list.html#ga5">list.h</a><li>stp_outfunc_t
-: <a class="el" href="group__vars.html#ga3">vars.h</a><li>stp_pack_tiff
-: <a class="el" href="weave_8h.html#a5">weave.h</a><li>stp_pack_uncompressed
-: <a class="el" href="weave_8h.html#a6">weave.h</a><li>stp_packfunc
-: <a class="el" href="weave_8h.html#a1">weave.h</a><li>stp_papersize_unit_t
-: <a class="el" href="group__papersize.html#ga5">paper.h</a><li>STP_PARAMETER_ACTIVE
-: <a class="el" href="group__vars.html#gga135a32">vars.h</a><li>stp_parameter_activity_t
-: <a class="el" href="group__vars.html#ga135">vars.h</a><li>STP_PARAMETER_CLASS_CORE
-: <a class="el" href="group__vars.html#gga133a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
-: <a class="el" href="group__vars.html#gga133a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
-: <a class="el" href="group__vars.html#gga133a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
-: <a class="el" href="group__vars.html#gga133a18">vars.h</a><li>stp_parameter_class_t
-: <a class="el" href="group__vars.html#ga133">vars.h</a><li>STP_PARAMETER_DEFAULTED
-: <a class="el" href="group__vars.html#gga135a31">vars.h</a><li>stp_parameter_description_destroy()
-: <a class="el" href="group__vars.html#ga48">vars.h</a><li>stp_parameter_find()
-: <a class="el" href="group__vars.html#ga40">vars.h</a><li>stp_parameter_find_in_settings()
-: <a class="el" href="group__vars.html#ga49">vars.h</a><li>STP_PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga135a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
-: <a class="el" href="group__vars.html#gga134a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
-: <a class="el" href="group__vars.html#gga134a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
-: <a class="el" href="group__vars.html#gga134a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
-: <a class="el" href="group__vars.html#gga134a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
-: <a class="el" href="group__vars.html#gga134a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
-: <a class="el" href="group__vars.html#gga134a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
-: <a class="el" href="group__vars.html#gga134a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
-: <a class="el" href="group__vars.html#gga134a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
-: <a class="el" href="group__vars.html#gga134a29">vars.h</a><li>stp_parameter_level_t
-: <a class="el" href="group__vars.html#ga134">vars.h</a><li>stp_parameter_list_add_param()
-: <a class="el" href="group__vars.html#ga44">vars.h</a><li>stp_parameter_list_append()
-: <a class="el" href="group__vars.html#ga46">vars.h</a><li>stp_parameter_list_copy()
-: <a class="el" href="group__vars.html#ga45">vars.h</a><li>stp_parameter_list_count()
-: <a class="el" href="group__vars.html#ga39">vars.h</a><li>stp_parameter_list_create()
-: <a class="el" href="group__vars.html#ga43">vars.h</a><li>stp_parameter_list_destroy()
-: <a class="el" href="group__vars.html#ga42">vars.h</a><li>stp_parameter_list_param()
-: <a class="el" href="group__vars.html#ga41">vars.h</a><li>stp_parameter_list_t
-: <a class="el" href="group__vars.html#ga1">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
-: <a class="el" href="group__vars.html#gga132a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
-: <a class="el" href="group__vars.html#gga132a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
-: <a class="el" href="group__vars.html#gga132a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
-: <a class="el" href="group__vars.html#gga132a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
-: <a class="el" href="group__vars.html#gga132a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
-: <a class="el" href="group__vars.html#gga132a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
-: <a class="el" href="group__vars.html#gga132a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
-: <a class="el" href="group__vars.html#gga132a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
-: <a class="el" href="group__vars.html#gga132a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
-: <a class="el" href="group__vars.html#gga132a7">vars.h</a><li>stp_parameter_type_t
-: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_parameter_verify_t
-: <a class="el" href="group__vars.html#ga136">vars.h</a><li>stp_path_search()
-: <a class="el" href="path_8h.html#a0">path.h</a><li>stp_path_split()
-: <a class="el" href="path_8h.html#a1">path.h</a><li>stp_print()
-: <a class="el" href="group__printer.html#ga15">printers.h</a><li>stp_printer_describe_parameter()
-: <a class="el" href="group__printer.html#ga24">printers.h</a><li>stp_printer_get_defaults()
-: <a class="el" href="group__printer.html#ga13">printers.h</a><li>stp_printer_get_driver()
-: <a class="el" href="group__printer.html#ga9">printers.h</a><li>stp_printer_get_family()
-: <a class="el" href="group__printer.html#ga10">printers.h</a><li>stp_printer_get_long_name()
-: <a class="el" href="group__printer.html#ga8">printers.h</a><li>stp_printer_get_manufacturer()
-: <a class="el" href="group__printer.html#ga11">printers.h</a><li>stp_printer_get_model()
-: <a class="el" href="group__printer.html#ga12">printers.h</a><li>stp_printer_list_parameters()
-: <a class="el" href="group__printer.html#ga23">printers.h</a><li>stp_printer_model_count()
-: <a class="el" href="group__printer.html#ga2">printers.h</a><li>stp_printer_t
-: <a class="el" href="group__printer.html#ga0">printers.h</a><li>stp_prune_inactive_options()
-: <a class="el" href="group__util.html#ga4">util.h</a><li>stp_put16_be()
-: <a class="el" href="group__util.html#ga9">util.h</a><li>stp_put16_le()
-: <a class="el" href="group__util.html#ga8">util.h</a><li>stp_put32_be()
-: <a class="el" href="group__util.html#ga11">util.h</a><li>stp_put32_le()
-: <a class="el" href="group__util.html#ga10">util.h</a><li>stp_putc()
-: <a class="el" href="group__util.html#ga7">util.h</a><li>stp_puts()
-: <a class="el" href="group__util.html#ga12">util.h</a><li>stp_read_and_compose_curves()
-: <a class="el" href="group__util.html#ga2">util.h</a><li>stp_realloc()
-: <a class="el" href="group__util.html#ga26">util.h</a><li>stp_register_xml_parser()
-: <a class="el" href="xml_8h.html#a1">xml.h</a><li>stp_register_xml_preload()
-: <a class="el" href="xml_8h.html#a3">xml.h</a><li>STP_SAFE_FREE
-: <a class="el" href="group__util.html#ga54">util.h</a><li>stp_scale_float_parameter()
-: <a class="el" href="group__vars.html#ga61">vars.h</a><li>stp_send_command()
-: <a class="el" href="group__util.html#ga13">util.h</a><li>stp_sequence_copy()
-: <a class="el" href="group__sequence.html#ga3">sequence.h</a><li>stp_sequence_create()
-: <a class="el" href="group__sequence.html#ga1">sequence.h</a><li>stp_sequence_create_copy()
-: <a class="el" href="group__sequence.html#ga4">sequence.h</a><li>stp_sequence_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a15">xml.h</a><li>stp_sequence_destroy()
-: <a class="el" href="group__sequence.html#ga2">sequence.h</a><li>stp_sequence_get_bounds()
-: <a class="el" href="group__sequence.html#ga6">sequence.h</a><li>stp_sequence_get_data()
-: <a class="el" href="group__sequence.html#ga12">sequence.h</a><li>stp_sequence_get_float_data()
-: <a class="el" href="group__sequence.html#ga22">sequence.h</a><li>stp_sequence_get_int_data()
-: <a class="el" href="group__sequence.html#ga25">sequence.h</a><li>stp_sequence_get_long_data()
-: <a class="el" href="group__sequence.html#ga23">sequence.h</a><li>stp_sequence_get_point()
-: <a class="el" href="group__sequence.html#ga14">sequence.h</a><li>stp_sequence_get_range()
-: <a class="el" href="group__sequence.html#ga7">sequence.h</a><li>stp_sequence_get_short_data()
-: <a class="el" href="group__sequence.html#ga27">sequence.h</a><li>stp_sequence_get_size()
-: <a class="el" href="group__sequence.html#ga9">sequence.h</a><li>stp_sequence_get_uint_data()
-: <a class="el" href="group__sequence.html#ga26">sequence.h</a><li>stp_sequence_get_ulong_data()
-: <a class="el" href="group__sequence.html#ga24">sequence.h</a><li>stp_sequence_get_ushort_data()
-: <a class="el" href="group__sequence.html#ga28">sequence.h</a><li>stp_sequence_set_bounds()
-: <a class="el" href="group__sequence.html#ga5">sequence.h</a><li>stp_sequence_set_data()
-: <a class="el" href="group__sequence.html#ga10">sequence.h</a><li>stp_sequence_set_float_data()
-: <a class="el" href="group__sequence.html#ga15">sequence.h</a><li>stp_sequence_set_int_data()
-: <a class="el" href="group__sequence.html#ga18">sequence.h</a><li>stp_sequence_set_long_data()
-: <a class="el" href="group__sequence.html#ga16">sequence.h</a><li>stp_sequence_set_point()
-: <a class="el" href="group__sequence.html#ga13">sequence.h</a><li>stp_sequence_set_short_data()
-: <a class="el" href="group__sequence.html#ga20">sequence.h</a><li>stp_sequence_set_size()
-: <a class="el" href="group__sequence.html#ga8">sequence.h</a><li>stp_sequence_set_subrange()
-: <a class="el" href="group__sequence.html#ga11">sequence.h</a><li>stp_sequence_set_uint_data()
-: <a class="el" href="group__sequence.html#ga19">sequence.h</a><li>stp_sequence_set_ulong_data()
-: <a class="el" href="group__sequence.html#ga17">sequence.h</a><li>stp_sequence_set_ushort_data()
-: <a class="el" href="group__sequence.html#ga21">sequence.h</a><li>stp_sequence_t
-: <a class="el" href="group__sequence.html#ga0">sequence.h</a><li>stp_set_array_parameter()
-: <a class="el" href="group__vars.html#ga59">vars.h</a><li>stp_set_array_parameter_active()
-: <a class="el" href="group__vars.html#ga98">vars.h</a><li>stp_set_boolean_parameter()
-: <a class="el" href="group__vars.html#ga57">vars.h</a><li>stp_set_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga96">vars.h</a><li>stp_set_color_conversion()
-: <a class="el" href="group__vars.html#ga14">vars.h</a><li>stp_set_color_conversion_n()
-: <a class="el" href="group__vars.html#ga15">vars.h</a><li>stp_set_curve_parameter()
-: <a class="el" href="group__vars.html#ga58">vars.h</a><li>stp_set_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga97">vars.h</a><li>stp_set_default_array_parameter()
-: <a class="el" href="group__vars.html#ga71">vars.h</a><li>stp_set_default_boolean_parameter()
-: <a class="el" href="group__vars.html#ga69">vars.h</a><li>stp_set_default_curve_parameter()
-: <a class="el" href="group__vars.html#ga70">vars.h</a><li>stp_set_default_dimension_parameter()
-: <a class="el" href="group__vars.html#ga68">vars.h</a><li>stp_set_default_file_parameter()
-: <a class="el" href="group__vars.html#ga64">vars.h</a><li>stp_set_default_file_parameter_n()
-: <a class="el" href="group__vars.html#ga65">vars.h</a><li>stp_set_default_float_parameter()
-: <a class="el" href="group__vars.html#ga66">vars.h</a><li>stp_set_default_int_parameter()
-: <a class="el" href="group__vars.html#ga67">vars.h</a><li>stp_set_default_raw_parameter()
-: <a class="el" href="group__vars.html#ga72">vars.h</a><li>stp_set_default_string_parameter()
-: <a class="el" href="group__vars.html#ga62">vars.h</a><li>stp_set_default_string_parameter_n()
-: <a class="el" href="group__vars.html#ga63">vars.h</a><li>stp_set_dimension_parameter()
-: <a class="el" href="group__vars.html#ga56">vars.h</a><li>stp_set_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga95">vars.h</a><li>stp_set_driver()
-: <a class="el" href="group__vars.html#ga11">vars.h</a><li>stp_set_driver_n()
-: <a class="el" href="group__vars.html#ga12">vars.h</a><li>stp_set_errdata()
-: <a class="el" href="group__vars.html#ga35">vars.h</a><li>stp_set_errfunc()
-: <a class="el" href="group__vars.html#ga31">vars.h</a><li>stp_set_file_parameter()
-: <a class="el" href="group__vars.html#ga52">vars.h</a><li>stp_set_file_parameter_active()
-: <a class="el" href="group__vars.html#ga92">vars.h</a><li>stp_set_file_parameter_n()
-: <a class="el" href="group__vars.html#ga53">vars.h</a><li>stp_set_float_parameter()
-: <a class="el" href="group__vars.html#ga54">vars.h</a><li>stp_set_float_parameter_active()
-: <a class="el" href="group__vars.html#ga93">vars.h</a><li>stp_set_height()
-: <a class="el" href="group__vars.html#ga23">vars.h</a><li>stp_set_int_parameter()
-: <a class="el" href="group__vars.html#ga55">vars.h</a><li>stp_set_int_parameter_active()
-: <a class="el" href="group__vars.html#ga94">vars.h</a><li>stp_set_left()
-: <a class="el" href="group__vars.html#ga17">vars.h</a><li>stp_set_outdata()
-: <a class="el" href="group__vars.html#ga33">vars.h</a><li>stp_set_outfunc()
-: <a class="el" href="group__vars.html#ga29">vars.h</a><li>stp_set_output_codeset()
-: <a class="el" href="group__util.html#ga1">util.h</a><li>stp_set_page_height()
-: <a class="el" href="group__vars.html#ga27">vars.h</a><li>stp_set_page_width()
-: <a class="el" href="group__vars.html#ga25">vars.h</a><li>stp_set_printer_defaults()
-: <a class="el" href="group__printer.html#ga14">printers.h</a><li>stp_set_raw_parameter()
-: <a class="el" href="group__vars.html#ga60">vars.h</a><li>stp_set_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga99">vars.h</a><li>stp_set_string_parameter()
-: <a class="el" href="group__vars.html#ga50">vars.h</a><li>stp_set_string_parameter_active()
-: <a class="el" href="group__vars.html#ga91">vars.h</a><li>stp_set_string_parameter_n()
-: <a class="el" href="group__vars.html#ga51">vars.h</a><li>stp_set_top()
-: <a class="el" href="group__vars.html#ga19">vars.h</a><li>stp_set_verified()
-: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_set_width()
-: <a class="el" href="group__vars.html#ga21">vars.h</a><li>stp_shade_t
-: <a class="el" href="dither_8h.html#a10">dither.h</a><li>stp_split_2()
-: <a class="el" href="bit-ops_8h.html#a1">bit-ops.h</a><li>stp_split_4()
-: <a class="el" href="bit-ops_8h.html#a2">bit-ops.h</a><li>stp_start_job()
-: <a class="el" href="group__printer.html#ga16">printers.h</a><li>stp_strdup()
-: <a class="el" href="group__util.html#ga30">util.h</a><li>stp_string_list_add_string()
-: <a class="el" href="string-list_8h.html#a7">string-list.h</a><li>stp_string_list_count()
-: <a class="el" href="string-list_8h.html#a5">string-list.h</a><li>stp_string_list_create()
-: <a class="el" href="string-list_8h.html#a1">string-list.h</a><li>stp_string_list_create_copy()
-: <a class="el" href="string-list_8h.html#a6">string-list.h</a><li>stp_string_list_create_from_params()
-: <a class="el" href="string-list_8h.html#a9">string-list.h</a><li>stp_string_list_destroy()
-: <a class="el" href="string-list_8h.html#a2">string-list.h</a><li>stp_string_list_find()
-: <a class="el" href="string-list_8h.html#a4">string-list.h</a><li>stp_string_list_is_present()
-: <a class="el" href="string-list_8h.html#a10">string-list.h</a><li>stp_string_list_param()
-: <a class="el" href="string-list_8h.html#a3">string-list.h</a><li>stp_string_list_remove_string()
-: <a class="el" href="string-list_8h.html#a8">string-list.h</a><li>stp_string_list_t
-: <a class="el" href="string-list_8h.html#a0">string-list.h</a><li>stp_strlen()
-: <a class="el" href="group__util.html#ga28">util.h</a><li>stp_strndup()
-: <a class="el" href="group__util.html#ga29">util.h</a><li>stp_unpack_16()
-: <a class="el" href="bit-ops_8h.html#a6">bit-ops.h</a><li>stp_unpack_2()
-: <a class="el" href="bit-ops_8h.html#a3">bit-ops.h</a><li>stp_unpack_4()
-: <a class="el" href="bit-ops_8h.html#a4">bit-ops.h</a><li>stp_unpack_8()
-: <a class="el" href="bit-ops_8h.html#a5">bit-ops.h</a><li>stp_unregister_xml_parser()
-: <a class="el" href="xml_8h.html#a2">xml.h</a><li>stp_unregister_xml_preload()
-: <a class="el" href="xml_8h.html#a4">xml.h</a><li>stp_vars_copy()
-: <a class="el" href="group__vars.html#ga8">vars.h</a><li>stp_vars_create()
-: <a class="el" href="group__vars.html#ga7">vars.h</a><li>stp_vars_create_copy()
-: <a class="el" href="group__vars.html#ga9">vars.h</a><li>stp_vars_destroy()
-: <a class="el" href="group__vars.html#ga10">vars.h</a><li>stp_vars_t
-: <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_verify()
-: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_verify_parameter()
-: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_verify_printer_params()
-: <a class="el" href="group__printer.html#ga19">printers.h</a><li>STP_WEAVE_ASCENDING
-: <a class="el" href="weave_8h.html#a26a12">weave.h</a><li>STP_WEAVE_ASCENDING_2X
-: <a class="el" href="weave_8h.html#a26a14">weave.h</a><li>STP_WEAVE_ASCENDING_3X
-: <a class="el" href="weave_8h.html#a26a16">weave.h</a><li>STP_WEAVE_DESCENDING
-: <a class="el" href="weave_8h.html#a26a13">weave.h</a><li>stp_weave_parameters_by_row()
-: <a class="el" href="weave_8h.html#a25">weave.h</a><li>STP_WEAVE_STAGGERED
-: <a class="el" href="weave_8h.html#a26a15">weave.h</a><li>stp_weave_strategy_t
-: <a class="el" href="weave_8h.html#a26">weave.h</a><li>STP_WEAVE_ZIGZAG
-: <a class="el" href="weave_8h.html#a26a11">weave.h</a><li>stp_write_weave()
-: <a class="el" href="weave_8h.html#a19">weave.h</a><li>stp_xml_exit()
-: <a class="el" href="xml_8h.html#a11">xml.h</a><li>stp_xml_get_node()
-: <a class="el" href="xml_8h.html#a12">xml.h</a><li>stp_xml_init()
-: <a class="el" href="xml_8h.html#a10">xml.h</a><li>stp_xml_init_defaults()
-: <a class="el" href="xml_8h.html#a5">xml.h</a><li>stp_xml_parse_file()
-: <a class="el" href="xml_8h.html#a6">xml.h</a><li>stp_xml_parse_file_named()
-: <a class="el" href="xml_8h.html#a21">xml.h</a><li>stp_xml_parse_func
-: <a class="el" href="xml_8h.html#a0">xml.h</a><li>stp_xml_preinit()
-: <a class="el" href="xml_8h.html#a14">xml.h</a><li>stp_xmldoc_create_generic()
-: <a class="el" href="xml_8h.html#a13">xml.h</a><li>stp_xmlstrtod()
-: <a class="el" href="xml_8h.html#a9">xml.h</a><li>stp_xmlstrtol()
-: <a class="el" href="xml_8h.html#a7">xml.h</a><li>stp_xmlstrtoul()
-: <a class="el" href="xml_8h.html#a8">xml.h</a><li>stp_xmltree_create_from_array()
-: <a class="el" href="xml_8h.html#a20">xml.h</a><li>stp_xmltree_create_from_curve()
-: <a class="el" href="xml_8h.html#a18">xml.h</a><li>stp_xmltree_create_from_sequence()
-: <a class="el" href="xml_8h.html#a16">xml.h</a><li>stp_zalloc()
-: <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
-: <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
-: <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__util.html#g9b6b2745ee2d68d1ca356a79c50f0ed7">util.h</a><li>stp_allocate_component_data()
+: <a class="el" href="group__vars.html#geb61df54d59bfebdcb77b1e5e993ebaa">vars.h</a><li>stp_array_copy()
+: <a class="el" href="group__array.html#gab9b031be229d8762faf46a3ef9454ec">array.h</a><li>stp_array_create()
+: <a class="el" href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66">array.h</a><li>stp_array_create_copy()
+: <a class="el" href="group__array.html#g19370f7d4779013904be75bc3d97e024">array.h</a><li>stp_array_create_from_xmltree()
+: <a class="el" href="xml_8h.html#301d2355b8bb9986a7bc4f84cc6c9d40">xml.h</a><li>stp_array_destroy()
+: <a class="el" href="group__array.html#g562ad19d8ecc1e9bdd8c182b0a05ecec">array.h</a><li>stp_array_get_data()
+: <a class="el" href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be">array.h</a><li>stp_array_get_point()
+: <a class="el" href="group__array.html#gb9d53cf70f2c892dca82b8db2414fad2">array.h</a><li>stp_array_get_sequence()
+: <a class="el" href="group__array.html#g2051c3f4a1eaccb198744f8d7c76d649">array.h</a><li>stp_array_get_size()
+: <a class="el" href="group__array.html#g48e34b2673c2973884f0a403bafe7ea8">array.h</a><li>stp_array_set_data()
+: <a class="el" href="group__array.html#g0ca3891b4cde193cc65de63053e3f4fa">array.h</a><li>stp_array_set_point()
+: <a class="el" href="group__array.html#g4ab405205d678a3d9ae02a98103fbfea">array.h</a><li>stp_array_set_size()
+: <a class="el" href="group__array.html#g698e51815f2ef3fd0709d6b32a2bb921">array.h</a><li>stp_array_t
+: <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">array.h</a><li>stp_asprintf()
+: <a class="el" href="group__util.html#g6bdd7099220fe310b228dcff5159b8d9">util.h</a><li>STP_BINARY_AGE
+: <a class="el" href="group__version.html#ge754fd2fde377ba0bbe61aee1a31dd9a">gutenprint-version.h</a><li>stp_binary_age
+: <a class="el" href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0">gutenprint-version.h</a><li>stp_catprintf()
+: <a class="el" href="group__util.html#g34d3ebda7c5b75ab40d1600f4d79a4be">util.h</a><li>stp_channel_add()
+: <a class="el" href="channel_8h.html#6a552629f3dddf6283f605e1961dd04f">channel.h</a><li>stp_channel_convert()
+: <a class="el" href="channel_8h.html#cef9de964c7569983e1ff1d0550d3bd6">channel.h</a><li>stp_channel_get_black_channel()
+: <a class="el" href="channel_8h.html#00bbe8c93cbe8da9f431824dbb1dadcd">channel.h</a><li>stp_channel_get_curve()
+: <a class="el" href="channel_8h.html#619228b113312c73cdce75b15bb88313">channel.h</a><li>stp_channel_get_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#c868578c0a82a76d20160b23a9c9d603">channel.h</a><li>stp_channel_get_density_adjustment()
+: <a class="el" href="channel_8h.html#0cfa6ae42ced76291f96ff64fed6a823">channel.h</a><li>stp_channel_get_gcr_curve()
+: <a class="el" href="channel_8h.html#0f1e6073d53036f6771a0cc69cf9e261">channel.h</a><li>stp_channel_get_gloss_channel()
+: <a class="el" href="channel_8h.html#a907ffda300039a00ae7ddb333038480">channel.h</a><li>stp_channel_get_gloss_limit()
+: <a class="el" href="channel_8h.html#e1702ed4a233cadce00e9bc87fd5ca45">channel.h</a><li>stp_channel_get_ink_limit()
+: <a class="el" href="channel_8h.html#f6423b74581fbf34918a9e45d22186b5">channel.h</a><li>stp_channel_get_input()
+: <a class="el" href="channel_8h.html#f5ef85fbc689b2f94c0be23c0b8b3765">channel.h</a><li>stp_channel_get_output()
+: <a class="el" href="channel_8h.html#9c4df56f4ad83b6232cf6ec17b6dc031">channel.h</a><li>stp_channel_get_value()
+: <a class="el" href="channel_8h.html#73265490d8c513de68604a982ec49e0a">channel.h</a><li>stp_channel_initialize()
+: <a class="el" href="channel_8h.html#00b63c73990babb75e5896ffd7022634">channel.h</a><li>STP_CHANNEL_LIMIT
+: <a class="el" href="group__image.html#gf71d7111a7215d4c1f1ef1317f9d6cfc">image.h</a><li>stp_channel_reset()
+: <a class="el" href="channel_8h.html#dc5c0cc7cc331da0ab394b642a381363">channel.h</a><li>stp_channel_reset_channel()
+: <a class="el" href="channel_8h.html#6a88eb8e1f968370b63326e517a34ec2">channel.h</a><li>stp_channel_set_black_channel()
+: <a class="el" href="channel_8h.html#6d315737ed90af4b0b9bff8c907381c3">channel.h</a><li>stp_channel_set_curve()
+: <a class="el" href="channel_8h.html#42d1438e758951e81ff49fbf81e73d2b">channel.h</a><li>stp_channel_set_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#4a04bbe68bd5c97d4b83cb1c1a147b48">channel.h</a><li>stp_channel_set_density_adjustment()
+: <a class="el" href="channel_8h.html#99f818da3b4944b328de9de860d04dbc">channel.h</a><li>stp_channel_set_gcr_curve()
+: <a class="el" href="channel_8h.html#2ce95b47a5f1a6c146588e0fb49db2e4">channel.h</a><li>stp_channel_set_gloss_channel()
+: <a class="el" href="channel_8h.html#38a09aeef9c53c039fa7d1124921a7c9">channel.h</a><li>stp_channel_set_gloss_limit()
+: <a class="el" href="channel_8h.html#4349853a306208c7d98074a585991ef0">channel.h</a><li>stp_channel_set_ink_limit()
+: <a class="el" href="channel_8h.html#9351c3b60ed0f43e012bbd2906b0f0b4">channel.h</a><li>stp_check_array_parameter()
+: <a class="el" href="group__vars.html#gdf6c305c48d012bc138db025c9bd63df">vars.h</a><li>stp_check_boolean_parameter()
+: <a class="el" href="group__vars.html#gadfd66825dd58fb8e0851d493445c4e4">vars.h</a><li>stp_check_curve_parameter()
+: <a class="el" href="group__vars.html#geecfc1f1fdc97ea165ae35b64de95178">vars.h</a><li>stp_check_dimension_parameter()
+: <a class="el" href="group__vars.html#gcdfa2f747081721c03b10484a832a535">vars.h</a><li>stp_check_file_parameter()
+: <a class="el" href="group__vars.html#gb411dae8fb16ec9f289d4f2f1ecabcfc">vars.h</a><li>stp_check_float_parameter()
+: <a class="el" href="group__vars.html#g2deea3612965e28cd0d513c5850ca074">vars.h</a><li>stp_check_int_parameter()
+: <a class="el" href="group__vars.html#g056b021334fe812aa14bbbfd60aafba8">vars.h</a><li>stp_check_raw_parameter()
+: <a class="el" href="group__vars.html#g5bd30b408d6ec16b3999dce5e540a5fa">vars.h</a><li>stp_check_string_parameter()
+: <a class="el" href="group__vars.html#gae6b21f76f675516e9189c47444e17cf">vars.h</a><li>stp_check_version()
+: <a class="el" href="group__version.html#g888f2f6268a658d1a6b71b5288299488">gutenprint-version.h</a><li>STP_CHECK_VERSION
+: <a class="el" href="group__version.html#g26c662a55c391d11663052ca39458972">gutenprint-version.h</a><li>stp_clear_array_parameter()
+: <a class="el" href="group__vars.html#gb9df68cbf9973203adfca5e1293b300a">vars.h</a><li>stp_clear_boolean_parameter()
+: <a class="el" href="group__vars.html#ge5b7e3356b3c1c893620fdeeea486e48">vars.h</a><li>stp_clear_curve_parameter()
+: <a class="el" href="group__vars.html#g9e992f880bd74cd4097527a39aea7125">vars.h</a><li>stp_clear_dimension_parameter()
+: <a class="el" href="group__vars.html#g28203d9250f232f9af290802cf2db881">vars.h</a><li>stp_clear_file_parameter()
+: <a class="el" href="group__vars.html#g7acde85eb361525f5cf481bafddbc1bd">vars.h</a><li>stp_clear_float_parameter()
+: <a class="el" href="group__vars.html#g740a5cab681f30b8cc5e4ca18197e472">vars.h</a><li>stp_clear_int_parameter()
+: <a class="el" href="group__vars.html#g4841e9250e4c7f38f2267355402ffcc1">vars.h</a><li>stp_clear_raw_parameter()
+: <a class="el" href="group__vars.html#ga79b051578077beca548be224062705c">vars.h</a><li>stp_clear_string_parameter()
+: <a class="el" href="group__vars.html#gc7fe8cd335309d755fe5b54bf6b8e5a3">vars.h</a><li>stp_color_count()
+: <a class="el" href="group__color.html#ga8b8b19da7bcc9bc814fe0f97f39b3ed">color.h</a><li>stp_color_describe_parameter()
+: <a class="el" href="group__color.html#gc47fecc2c32115494ea364e53d9f1ff2">color.h</a><li>stp_color_get_long_name()
+: <a class="el" href="group__color.html#ga0559d7812bdcbebe4edc14fc05274d9">color.h</a><li>stp_color_get_name()
+: <a class="el" href="group__color.html#g36d2d72d2cd967405a978b76a7a8c992">color.h</a><li>stp_color_get_row()
+: <a class="el" href="group__color.html#gadf861820b3956ef7b18600dbf5da9da">color.h</a><li>stp_color_init()
+: <a class="el" href="group__color.html#g835bd7024477347a46ea0c14b46996c6">color.h</a><li>stp_color_list_parameters()
+: <a class="el" href="group__color.html#ge2e397268288111eaffd352cb0ff1b98">color.h</a><li>stp_color_register()
+: <a class="el" href="group__color.html#ge3543409e331c5d1756c2c8fe927343b">color.h</a><li>stp_color_t
+: <a class="el" href="group__color.html#gb711e2534c69bde47be7af3409c8ee2c">color.h</a><li>stp_color_unregister()
+: <a class="el" href="group__color.html#g3e0f2728d47e1701c00b06199bc5512d">color.h</a><li>stp_compute_linewidth_func
+: <a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">weave.h</a><li>stp_compute_tiff_linewidth
+: <a class="el" href="weave_8h.html#a6df061ed81c1a6ecb8854b6eab4e276">weave.h</a><li>stp_compute_uncompressed_linewidth
+: <a class="el" href="weave_8h.html#f6c7a76f229fdc0be020a53a15a4a5f5">weave.h</a><li>stp_const_parameter_list_t
+: <a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">vars.h</a><li>stp_copy_data_func_t
+: <a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">vars.h</a><li>stp_copy_options()
+: <a class="el" href="group__vars.html#gbd8b19b70d2f2fc7dcd7c896b3ed5d98">vars.h</a><li>STP_CURRENT_INTERFACE
+: <a class="el" href="group__version.html#g08cdc7e05ec4d52b2458470b6d0047fb">gutenprint-version.h</a><li>stp_current_interface
+: <a class="el" href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc">gutenprint-version.h</a><li>STP_CURVE_BOUNDS_CLIP
+: <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
+: <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a">curve.h</a><li>STP_CURVE_BOUNDS_RESCALE
+: <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09">curve.h</a><li>stp_curve_bounds_t
+: <a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">curve.h</a><li>stp_curve_cache_copy()
+: <a class="el" href="curve-cache_8h.html#6a8addcc359b8cfbc2fa5c8cec97643d">curve-cache.h</a><li>stp_curve_cache_curve_data()
+: <a class="el" href="curve-cache_8h.html#5cb281dd07eecda913b168451b2d615b">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
+: <a class="el" href="curve-cache_8h.html#7966337362f5e8fc0ed54edd8da645a2">curve-cache.h</a><li>stp_curve_cache_get_count()
+: <a class="el" href="curve-cache_8h.html#723301540e82db80f8ce9100ec832876">curve-cache.h</a><li>stp_curve_cache_get_curve()
+: <a class="el" href="curve-cache_8h.html#256ae4356b6205ba61fbc6b5e90c1762">curve-cache.h</a><li>stp_curve_cache_get_double_data()
+: <a class="el" href="curve-cache_8h.html#83788e3f9d421bdab139d92127a7e5e3">curve-cache.h</a><li>stp_curve_cache_get_ushort_data()
+: <a class="el" href="curve-cache_8h.html#6a318767b044ac996ae318771f715a01">curve-cache.h</a><li>stp_curve_cache_set_curve()
+: <a class="el" href="curve-cache_8h.html#f775dcfafb717b24ff655cc801c14dfc">curve-cache.h</a><li>stp_curve_cache_set_curve_copy()
+: <a class="el" href="curve-cache_8h.html#33011bde2e051e0b222177b0db746da9">curve-cache.h</a><li>stp_curve_compose()
+: <a class="el" href="group__curve.html#g657e0ad5b93f090220d35be615fec5e4">curve.h</a><li>STP_CURVE_COMPOSE_ADD
+: <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d">curve.h</a><li>STP_CURVE_COMPOSE_EXPONENTIATE
+: <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701">curve.h</a><li>STP_CURVE_COMPOSE_MULTIPLY
+: <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011">curve.h</a><li>stp_curve_compose_t
+: <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">curve.h</a><li>stp_curve_copy()
+: <a class="el" href="group__curve.html#gfdafb0a802f00063b00713dbd6d6bfc0">curve.h</a><li>stp_curve_count_points()
+: <a class="el" href="group__curve.html#g48d9023f28ae2d15975002f7a9d7f94e">curve.h</a><li>stp_curve_create()
+: <a class="el" href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6">curve.h</a><li>stp_curve_create_copy()
+: <a class="el" href="group__curve.html#ge76787e84f2fc3ba299de94f4ecc6d82">curve.h</a><li>stp_curve_create_from_file()
+: <a class="el" href="group__curve.html#g6ff03fcc2a47f297c48b683884e81924">curve.h</a><li>stp_curve_create_from_stream()
+: <a class="el" href="group__curve.html#g650e49e1250dab5d9221ad747a627fc0">curve.h</a><li>stp_curve_create_from_string()
+: <a class="el" href="group__curve.html#g60dce8c741a9b6fde73ced2134305298">curve.h</a><li>stp_curve_create_from_xmltree()
+: <a class="el" href="xml_8h.html#4b39835d489b183bdf939551f7b6871b">xml.h</a><li>stp_curve_destroy()
+: <a class="el" href="group__curve.html#g01bf94ed6a523f28dd909be054a69790">curve.h</a><li>stp_curve_free_curve_cache()
+: <a class="el" href="curve-cache_8h.html#3cef707d88b48136a52f733f80ae52dd">curve-cache.h</a><li>stp_curve_get_bounds()
+: <a class="el" href="group__curve.html#g4d32e3000dd3a8f258b2eab94797731b">curve.h</a><li>stp_curve_get_data()
+: <a class="el" href="group__curve.html#g24b9486c45d68983e94dcc0fb19edacd">curve.h</a><li>stp_curve_get_data_points()
+: <a class="el" href="group__curve.html#gd30e41654f1e0217aae3389b30cdffba">curve.h</a><li>stp_curve_get_float_data()
+: <a class="el" href="group__curve.html#gf363a0f9686bcd6521671d531bc522d5">curve.h</a><li>stp_curve_get_gamma()
+: <a class="el" href="group__curve.html#gc9786b35c2b1a55d54b62bcc57481c82">curve.h</a><li>stp_curve_get_int_data()
+: <a class="el" href="group__curve.html#g01bda0b947a6075d4a1ed373865744e6">curve.h</a><li>stp_curve_get_interpolation_type()
+: <a class="el" href="group__curve.html#gca245aa6907c2fb95e150ce9a86ddb1a">curve.h</a><li>stp_curve_get_long_data()
+: <a class="el" href="group__curve.html#g187af251d5a89853545c8be898a00cc1">curve.h</a><li>stp_curve_get_point()
+: <a class="el" href="group__curve.html#gf9ff6f55ec0a0615608dc1baec6aff00">curve.h</a><li>stp_curve_get_range()
+: <a class="el" href="group__curve.html#gaf8bad025ea7463067c9d7ab205af062">curve.h</a><li>stp_curve_get_sequence()
+: <a class="el" href="group__curve.html#gee3cc69ab758b400838014df4742c28e">curve.h</a><li>stp_curve_get_short_data()
+: <a class="el" href="group__curve.html#g60767bb2143fe4d491d351a4c0abc3b1">curve.h</a><li>stp_curve_get_subrange()
+: <a class="el" href="group__curve.html#gd4cfbfbfe0c16b8f2ef4d8c44d221172">curve.h</a><li>stp_curve_get_uint_data()
+: <a class="el" href="group__curve.html#gb874365285383f3eb35c1a32496a69b4">curve.h</a><li>stp_curve_get_ulong_data()
+: <a class="el" href="group__curve.html#g3ecbc0ce98e7bd7695002306f5a2ba1b">curve.h</a><li>stp_curve_get_ushort_data()
+: <a class="el" href="group__curve.html#gb2312169172ec9789af9fd38279b3273">curve.h</a><li>stp_curve_get_wrap()
+: <a class="el" href="group__curve.html#gd2aade6a22b516006ce0f897c5027f35">curve.h</a><li>stp_curve_interpolate_value()
+: <a class="el" href="group__curve.html#g0fdfc2b27a8a464584589ef38a8e05c4">curve.h</a><li>stp_curve_is_piecewise()
+: <a class="el" href="group__curve.html#gdda4313c874170e0086d2000ed04c02f">curve.h</a><li>stp_curve_resample()
+: <a class="el" href="group__curve.html#gf68cf2508ff4a14a0dbee6fc0001667e">curve.h</a><li>stp_curve_rescale()
+: <a class="el" href="group__curve.html#gd440d8d448173adc2be6737963a6e999">curve.h</a><li>stp_curve_set_bounds()
+: <a class="el" href="group__curve.html#g5283a18fcc5db8e9f9384d54de50ba83">curve.h</a><li>stp_curve_set_data()
+: <a class="el" href="group__curve.html#gba540befdbd82e705358b2175d5b92e8">curve.h</a><li>stp_curve_set_data_points()
+: <a class="el" href="group__curve.html#gcbd01a2662edb48af0816930b40dc8ab">curve.h</a><li>stp_curve_set_float_data()
+: <a class="el" href="group__curve.html#gc0401bfefa3990ca26a0fb7718f1ebb2">curve.h</a><li>stp_curve_set_gamma()
+: <a class="el" href="group__curve.html#g6548b7ca6ef6ab94fe1d927c246e7baf">curve.h</a><li>stp_curve_set_int_data()
+: <a class="el" href="group__curve.html#gbc9ae004e972c7d638336714f3112f9b">curve.h</a><li>stp_curve_set_interpolation_type()
+: <a class="el" href="group__curve.html#g3175711d943e95fdf363d5124237a56e">curve.h</a><li>stp_curve_set_long_data()
+: <a class="el" href="group__curve.html#gaf770dcae26ce48d5ee50dd8217e2c14">curve.h</a><li>stp_curve_set_point()
+: <a class="el" href="group__curve.html#g9a05eae4f274f420418539cceb627556">curve.h</a><li>stp_curve_set_short_data()
+: <a class="el" href="group__curve.html#gd23dcc9abefca9a98b3ecd9714227093">curve.h</a><li>stp_curve_set_subrange()
+: <a class="el" href="group__curve.html#g0ba6753a8beeaca19719d047da25ecb5">curve.h</a><li>stp_curve_set_uint_data()
+: <a class="el" href="group__curve.html#g8a215d4981a74fb2b6e4a0c381314df0">curve.h</a><li>stp_curve_set_ulong_data()
+: <a class="el" href="group__curve.html#g184e0e32892aae4b2c195c6fc880bace">curve.h</a><li>stp_curve_set_ushort_data()
+: <a class="el" href="group__curve.html#g4051de3e6be42f4499de78af67288616">curve.h</a><li>stp_curve_t
+: <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">curve.h</a><li>STP_CURVE_TYPE_LINEAR
+: <a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff">curve.h</a><li>STP_CURVE_TYPE_SPLINE
+: <a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4">curve.h</a><li>stp_curve_type_t
+: <a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">curve.h</a><li>STP_CURVE_WRAP_AROUND
+: <a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2">curve.h</a><li>stp_curve_wrap_mode_t
+: <a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">curve.h</a><li>STP_CURVE_WRAP_NONE
+: <a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85">curve.h</a><li>stp_curve_write()
+: <a class="el" href="group__curve.html#g6ef71ce7d92e659b1c902df29b1dcbc7">curve.h</a><li>stp_curve_write_string()
+: <a class="el" href="group__curve.html#g21aa4497c58ebbb703dc3549560f084d">curve.h</a><li>STP_DBG_CANON
+: <a class="el" href="group__util.html#ga0d6b1a8d780b3c5f970454678bc0323">util.h</a><li>STP_DBG_COLORFUNC
+: <a class="el" href="group__util.html#g3560e33ba80d2a0ceb07fe51fac845be">util.h</a><li>STP_DBG_CURVE
+: <a class="el" href="group__util.html#g9eaf8d50f127cd4316bf68ad34092551">util.h</a><li>STP_DBG_CURVE_ERRORS
+: <a class="el" href="group__util.html#gc80b8553e636ec01fe4e975d9f7668b9">util.h</a><li>STP_DBG_ESCP2
+: <a class="el" href="group__util.html#g158e1ea4acff071440681ba678b6fb0b">util.h</a><li>STP_DBG_INK
+: <a class="el" href="group__util.html#g328a4b66d0767134649ce30b243931c9">util.h</a><li>STP_DBG_LEXMARK
+: <a class="el" href="group__util.html#gb8180ab505c2d7c5a717a53096ac770c">util.h</a><li>STP_DBG_LIST
+: <a class="el" href="group__util.html#gcb3d85de1088cf795cfeaa9e1450c4e0">util.h</a><li>STP_DBG_LUT
+: <a class="el" href="group__util.html#g9ef88b326f83d342849fa89c33c7e4a7">util.h</a><li>STP_DBG_MARK_FILE
+: <a class="el" href="group__util.html#g9c8f6255efb1fcf9cd3e7a68466e44ba">util.h</a><li>STP_DBG_MODULE
+: <a class="el" href="group__util.html#g6d69d079a3d7a3e0e2b870e1e9417187">util.h</a><li>STP_DBG_OLYMPUS
+: <a class="el" href="group__util.html#g4dc6609c9bb0c256fec7361f41a5c45f">util.h</a><li>STP_DBG_PAPER
+: <a class="el" href="group__util.html#g08f48f3423e848f1932435c5f8e94ff7">util.h</a><li>STP_DBG_PATH
+: <a class="el" href="group__util.html#gb11ef5f0ed150be2d3b999b7fc7e4f24">util.h</a><li>STP_DBG_PCL
+: <a class="el" href="group__util.html#g30a9efd31b78debefd550d0b337ec795">util.h</a><li>STP_DBG_PRINTERS
+: <a class="el" href="group__util.html#g7bbbf3d31a1a4f6b0da808184e1c1587">util.h</a><li>STP_DBG_PS
+: <a class="el" href="group__util.html#g8d8211f97675b37f18bff822757d04b3">util.h</a><li>STP_DBG_ROWS
+: <a class="el" href="group__util.html#gb764d477ebf0db4957cc316badac70bd">util.h</a><li>STP_DBG_VARS
+: <a class="el" href="group__util.html#g52844a51058ca29f975b5666743622ac">util.h</a><li>STP_DBG_WEAVE_PARAMS
+: <a class="el" href="group__util.html#gc746369f247dc346bcbdeacb1abbdbcb">util.h</a><li>STP_DBG_XML
+: <a class="el" href="group__util.html#g51aee81a3d2a33d42417f6b61bb63f5e">util.h</a><li>stp_default_media_size()
+: <a class="el" href="group__papersize.html#g2fe5d85acaa4ff8b8e4ad1ff3cccb027">paper.h</a><li>stp_default_settings()
+: <a class="el" href="group__vars.html#g9f897908b19f5f0cdaf75b483d46e041">vars.h</a><li>stp_deprintf()
+: <a class="el" href="group__util.html#gf7bc1bd0ff92ca0f6ba7d0eb559e1da3">util.h</a><li>stp_describe_output()
+: <a class="el" href="group__printer.html#g950e2cd193926440ba250dbc184d8588">printers.h</a><li>stp_describe_parameter()
+: <a class="el" href="group__vars.html#ged453c314365a3948b195e3175455a12">vars.h</a><li>stp_describe_resolution()
+: <a class="el" href="group__vars.html#g5735451225c2a355cb11c165e011637d">vars.h</a><li>stp_destroy_component_data()
+: <a class="el" href="group__vars.html#g089f9a34f26f700f43858ba3959d8f13">vars.h</a><li>stp_dither()
+: <a class="el" href="dither_8h.html#a22b0e4fe00acaf11ce611e29f1b1ba3">dither.h</a><li>stp_dither_add_channel()
+: <a class="el" href="dither_8h.html#28bb47c7e1436e2c4af3b0be87b5d1c6">dither.h</a><li>stp_dither_describe_parameter()
+: <a class="el" href="dither_8h.html#6daf654828bc5235bc785fceb8aebb89">dither.h</a><li>stp_dither_get_channel()
+: <a class="el" href="dither_8h.html#94da054fb7a3f42cf4c2937f4d37e528">dither.h</a><li>stp_dither_get_first_position()
+: <a class="el" href="dither_8h.html#f113ac1043230813204db189e3fd84a8">dither.h</a><li>stp_dither_get_last_position()
+: <a class="el" href="dither_8h.html#e13f1c62835c48c5fb58b45c8ed35f32">dither.h</a><li>stp_dither_init()
+: <a class="el" href="dither_8h.html#6d409bf6395231621a725a45fac8bb8e">dither.h</a><li>stp_dither_internal()
+: <a class="el" href="dither_8h.html#e1fe7fb65133dd6ffc227e6fcdd18fdd">dither.h</a><li>stp_dither_list_parameters()
+: <a class="el" href="dither_8h.html#9ad687cfc22956dd88495ae0a831c1b6">dither.h</a><li>stp_dither_matrix_clone()
+: <a class="el" href="dither_8h.html#aaa6d937beb5f9bef6e7ec34fc776d54">dither.h</a><li>stp_dither_matrix_copy()
+: <a class="el" href="dither_8h.html#289ae89081129060bf67371d7ce9fcef">dither.h</a><li>stp_dither_matrix_destroy()
+: <a class="el" href="dither_8h.html#361cf36b4875e8ef2c8152f66d4a9284">dither.h</a><li>stp_dither_matrix_generic_t
+: <a class="el" href="dither_8h.html#c81f99c36dbc48c619831897bac28224">dither.h</a><li>stp_dither_matrix_impl_t
+: <a class="el" href="dither_8h.html#613c628e788dbef089fa32243500cd54">dither.h</a><li>stp_dither_matrix_init()
+: <a class="el" href="dither_8h.html#8346fdae0bfb7422f52c0a2eec3abd87">dither.h</a><li>stp_dither_matrix_init_from_dither_array()
+: <a class="el" href="dither_8h.html#a9efd9cefabdab92a8ce5fbf7aca8876">dither.h</a><li>stp_dither_matrix_init_short()
+: <a class="el" href="dither_8h.html#6a7a7142c53dd1cd70b3f7fb481e5564">dither.h</a><li>stp_dither_matrix_iterated_init()
+: <a class="el" href="dither_8h.html#e79d2866600d79be412b660f036995f4">dither.h</a><li>stp_dither_matrix_normal_t
+: <a class="el" href="dither_8h.html#a7bbfbb8dd05a8c05a5c37143adc129a">dither.h</a><li>stp_dither_matrix_scale_exponentially()
+: <a class="el" href="dither_8h.html#0d1f33cd934e13ed0b0f859d131efbc1">dither.h</a><li>stp_dither_matrix_set_row()
+: <a class="el" href="dither_8h.html#c329929a25c54355a7ed23f23616ced5">dither.h</a><li>stp_dither_matrix_shear()
+: <a class="el" href="dither_8h.html#1c29e4d285f27f7fd300643f7023f305">dither.h</a><li>stp_dither_matrix_short_t
+: <a class="el" href="dither_8h.html#373f2efaf250ca412b5447b8bd4e7f51">dither.h</a><li>stp_dither_matrix_validate_array()
+: <a class="el" href="dither_8h.html#05677f96e6de536ecf91a65ee0715998">dither.h</a><li>stp_dither_set_adaptive_limit()
+: <a class="el" href="dither_8h.html#d261306c74a8affdf11ad2cc519e8bba">dither.h</a><li>stp_dither_set_ink_spread()
+: <a class="el" href="dither_8h.html#744fa9a5d204da486f07a8f1b21c9ba3">dither.h</a><li>stp_dither_set_inks()
+: <a class="el" href="dither_8h.html#fd1d75ef5cfb0e013601a4e084352786">dither.h</a><li>stp_dither_set_inks_full()
+: <a class="el" href="dither_8h.html#0aae5a947e8953323b097fbb79c93c68">dither.h</a><li>stp_dither_set_inks_simple()
+: <a class="el" href="dither_8h.html#ffc1834e675956e79ae5a866895db39c">dither.h</a><li>stp_dither_set_iterated_matrix()
+: <a class="el" href="dither_8h.html#85eb5568b8a8036271e50794519c08e2">dither.h</a><li>stp_dither_set_matrix()
+: <a class="el" href="dither_8h.html#25b3d76810fd0dcb0928edff37060409">dither.h</a><li>stp_dither_set_matrix_from_dither_array()
+: <a class="el" href="dither_8h.html#ae5be944ec353d075ea17c32370270bd">dither.h</a><li>stp_dither_set_randomizer()
+: <a class="el" href="dither_8h.html#6d8fc8a344a764f92ee43ff8b959aace">dither.h</a><li>stp_dither_set_transition()
+: <a class="el" href="dither_8h.html#d7cd0b4e7bf474516b14d0a186b23b96">dither.h</a><li>stp_dotsize_t
+: <a class="el" href="dither_8h.html#0a4617ed6063c68c6c8675fb9e8e9d01">dither.h</a><li>stp_dprintf()
+: <a class="el" href="group__util.html#g24e214e32810cc67c493c270a6ad83d6">util.h</a><li>STP_ECOLOR_C
+: <a class="el" href="dither_8h.html#575ca9b45d518b92177323e70295198a">dither.h</a><li>STP_ECOLOR_K
+: <a class="el" href="dither_8h.html#4faa7aec0dc7471ed5a7d1622991ac77">dither.h</a><li>STP_ECOLOR_M
+: <a class="el" href="dither_8h.html#c7f1f45ff56dfbaff0a36599c6bf822c">dither.h</a><li>STP_ECOLOR_Y
+: <a class="el" href="dither_8h.html#e1492502d48a830e5dda11f1d7afb494">dither.h</a><li>stp_end_job()
+: <a class="el" href="group__printer.html#g40637834f08a166992325af09f6a6030">printers.h</a><li>stp_eprintf()
+: <a class="el" href="group__util.html#g47c73485971132d9b41a33bdf572f670">util.h</a><li>stp_erprintf()
+: <a class="el" href="group__util.html#g5f6389ed7d500f851cabe8425a158e4b">util.h</a><li>stp_erputc()
+: <a class="el" href="group__util.html#g859b75eddde620338859121451096097">util.h</a><li>stp_family_register()
+: <a class="el" href="group__printer.html#g82b22438444849bdedb4cfbe22f209e8">printers.h</a><li>stp_family_t
+: <a class="el" href="group__printer.html#g5c0458c3c1d19474e0245c47dac29e70">printers.h</a><li>stp_family_unregister()
+: <a class="el" href="group__printer.html#ga2ab30a5e5442b7a552fc3b884e1511b">printers.h</a><li>stp_fill_parameter_settings()
+: <a class="el" href="group__vars.html#g6a08746f33133e8873236b35eb1e7a62">vars.h</a><li>stp_fill_tiff
+: <a class="el" href="weave_8h.html#6c47bead0399664b9041a6d5687b091e">weave.h</a><li>stp_fill_uncompressed
+: <a class="el" href="weave_8h.html#fb161f053574d9cd4a47b613b614b0f3">weave.h</a><li>stp_fillfunc
+: <a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">weave.h</a><li>stp_find_standard_dither_array()
+: <a class="el" href="dither_8h.html#ef8ca9aa08ab848746e370100a4b20e2">dither.h</a><li>stp_flush_all()
+: <a class="el" href="weave_8h.html#5b0aac599abc4859e2d208db7185cdbf">weave.h</a><li>stp_flush_debug_messages()
+: <a class="el" href="group__util.html#gf39c22b74843750ca74a6caccb263c7c">util.h</a><li>stp_flushfunc
+: <a class="el" href="weave_8h.html#76c426b3b4c3b2503c54f2c2a013768a">weave.h</a><li>stp_fold()
+: <a class="el" href="bit-ops_8h.html#ec711fffd61ebd40a6896d76d4c9327f">bit-ops.h</a><li>stp_free()
+: <a class="el" href="group__util.html#gabf89ff6213b9dc568fbdd1342b663ad">util.h</a><li>stp_free_data_func_t
+: <a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">vars.h</a><li>stp_get_array_parameter()
+: <a class="el" href="group__vars.html#gb918206f9b70fff5d58a16a762295981">vars.h</a><li>stp_get_array_parameter_active()
+: <a class="el" href="group__vars.html#g64e5f74483ffb7bd4412f4eefeb22250">vars.h</a><li>stp_get_boolean_parameter()
+: <a class="el" href="group__vars.html#g4cc8b69619067f882035cca46e9ce0cd">vars.h</a><li>stp_get_boolean_parameter_active()
+: <a class="el" href="group__vars.html#g361d0ba27ad2ec9e99e5eec05f2e76a6">vars.h</a><li>stp_get_color_by_colorfuncs()
+: <a class="el" href="group__color.html#ga92373d7aa315ab6e32a1bb0ac944b79">color.h</a><li>stp_get_color_by_index()
+: <a class="el" href="group__color.html#ga5ddc4c9d02576154d0b2c6c64a6a033">color.h</a><li>stp_get_color_by_name()
+: <a class="el" href="group__color.html#g25d9ee3ceee6d6e9964007ad12f9900b">color.h</a><li>stp_get_color_conversion()
+: <a class="el" href="group__vars.html#g087136342c500c138d73dbe0e2aad11a">vars.h</a><li>stp_get_component_data()
+: <a class="el" href="group__vars.html#g8eea0724106ea7174b808026ae8d1a5c">vars.h</a><li>stp_get_curve_parameter()
+: <a class="el" href="group__vars.html#g1a5a2746548465d681d00c6301a26100">vars.h</a><li>stp_get_curve_parameter_active()
+: <a class="el" href="group__vars.html#gb686075ecbdf349387c356826b432191">vars.h</a><li>stp_get_debug_level()
+: <a class="el" href="group__util.html#g9ab4c35dd4b6e142281ff36ecedee27e">util.h</a><li>stp_get_dimension_parameter()
+: <a class="el" href="group__vars.html#gb4121cba599314c929d04cce0e850473">vars.h</a><li>stp_get_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g8125d08f90002e654f2e45427e2f0251">vars.h</a><li>stp_get_driver()
+: <a class="el" href="group__vars.html#gcf8efdb6fd9847e41c85f9491a252f01">vars.h</a><li>stp_get_errdata()
+: <a class="el" href="group__vars.html#ge66b9c64f5821ee6e95f4b9e18cadd4e">vars.h</a><li>stp_get_errfunc()
+: <a class="el" href="group__vars.html#g9fe5b4efdfaa3e79918dd5079e61e2c5">vars.h</a><li>stp_get_file_parameter()
+: <a class="el" href="group__vars.html#g5efb45e6883a2522fd7e78c6eb761c79">vars.h</a><li>stp_get_file_parameter_active()
+: <a class="el" href="group__vars.html#g0f09e85b570ffee4a4d94853bb22bcb3">vars.h</a><li>stp_get_float_parameter()
+: <a class="el" href="group__vars.html#g46195f69cc57bd18a4cde5756dd84601">vars.h</a><li>stp_get_float_parameter_active()
+: <a class="el" href="group__vars.html#g28d01beda4b54cec395654847dbbc301">vars.h</a><li>stp_get_height()
+: <a class="el" href="group__vars.html#g7623276e130cb684670ecb153300ebaf">vars.h</a><li>stp_get_imageable_area()
+: <a class="el" href="group__vars.html#gebcb03afca6bb0d94e71bdf570d09af9">vars.h</a><li>stp_get_int_parameter()
+: <a class="el" href="group__vars.html#g22bc2b8307fb6a95dac7fcf3d35bf6b9">vars.h</a><li>stp_get_int_parameter_active()
+: <a class="el" href="group__vars.html#gac76d8e06c3ce3fb0f27c0c80d6ad5fc">vars.h</a><li>stp_get_left()
+: <a class="el" href="group__vars.html#gd3fbd778898c2b0fba19d0937fb939f5">vars.h</a><li>stp_get_lineactive_by_pass()
+: <a class="el" href="weave_8h.html#14c1a0f43a0353f7771632d3a0356cea">weave.h</a><li>stp_get_linebases_by_pass()
+: <a class="el" href="weave_8h.html#207eac262dceb86f20fe32b048b257ad">weave.h</a><li>stp_get_linecount_by_pass()
+: <a class="el" href="weave_8h.html#46dacaec8d953a33f6c15299f3a91046">weave.h</a><li>stp_get_lineoffsets_by_pass()
+: <a class="el" href="weave_8h.html#816c57bb673bebebaa42576b3e452206">weave.h</a><li>stp_get_media_size()
+: <a class="el" href="group__vars.html#ge690d9171bcdb0fedf981804bb923fac">vars.h</a><li>stp_get_model_id()
+: <a class="el" href="group__printer.html#gc09e99e20c8a19a13a5fb6356742a92a">printers.h</a><li>stp_get_outdata()
+: <a class="el" href="group__vars.html#g54e35f94578f346c07718587f18b049c">vars.h</a><li>stp_get_outfunc()
+: <a class="el" href="group__vars.html#g095834813ebbe8985d443e1fa78a0b98">vars.h</a><li>stp_get_page_height()
+: <a class="el" href="group__vars.html#g94d8cf912e3b036f67bc2d4c37d733ff">vars.h</a><li>stp_get_page_width()
+: <a class="el" href="group__vars.html#gea14f3cad139fc5b8d547a252deacff3">vars.h</a><li>stp_get_papersize_by_index()
+: <a class="el" href="group__papersize.html#g08bb891f58a7decfee2b073c00715993">paper.h</a><li>stp_get_papersize_by_name()
+: <a class="el" href="group__papersize.html#g9d655e3de6954ad3c5933dc736d2509a">paper.h</a><li>stp_get_papersize_by_size()
+: <a class="el" href="group__papersize.html#g0438b0e4729f37579900b591e801f8ce">paper.h</a><li>stp_get_parameter_list()
+: <a class="el" href="group__vars.html#g955b215a88b868cfc74d7a340de9b8f6">vars.h</a><li>stp_get_pass_by_pass()
+: <a class="el" href="weave_8h.html#129f77403ade9f504dd38185a7ab6209">weave.h</a><li>stp_get_printer()
+: <a class="el" href="group__printer.html#gcb4cdcada01ff29c5fd4ffeaa576db9e">printers.h</a><li>stp_get_printer_by_driver()
+: <a class="el" href="group__printer.html#g947fa230e08f9c854ca2608e76bd0d58">printers.h</a><li>stp_get_printer_by_index()
+: <a class="el" href="group__printer.html#g1286559c60d239563f9f15fdd27996e0">printers.h</a><li>stp_get_printer_by_long_name()
+: <a class="el" href="group__printer.html#gc041944e528afcb9a795eb6ece3fc6ff">printers.h</a><li>stp_get_printer_index_by_driver()
+: <a class="el" href="group__printer.html#g6f32b0213b580bf081fc8752a3eb04a1">printers.h</a><li>stp_get_raw_parameter()
+: <a class="el" href="group__vars.html#g9f4db93fc31ad52018bc3ad14b58bfc2">vars.h</a><li>stp_get_raw_parameter_active()
+: <a class="el" href="group__vars.html#g57abcfb2fa58e743f9d30f579481845a">vars.h</a><li>stp_get_release_version()
+: <a class="el" href="group__util.html#ged2a65d98cba1fd6d48c0cc1b611ae0f">util.h</a><li>stp_get_size_limit()
+: <a class="el" href="group__vars.html#gf2c1a37f8d837fae61bb18de1cd7bdc3">vars.h</a><li>stp_get_string_parameter()
+: <a class="el" href="group__vars.html#ga59b141facb320c409d9071f469fdbc5">vars.h</a><li>stp_get_string_parameter_active()
+: <a class="el" href="group__vars.html#gda8dd20ab17a9b403c68b4cd86fb529c">vars.h</a><li>stp_get_top()
+: <a class="el" href="group__vars.html#gcda38fc8e26a75c2b5d246b4341a8fd3">vars.h</a><li>stp_get_verified()
+: <a class="el" href="group__vars.html#ga1b826f02f84aa038c6862575770b629">vars.h</a><li>stp_get_version()
+: <a class="el" href="group__util.html#g77022a2cfde3a9ba9269f1bc3726175c">util.h</a><li>stp_get_width()
+: <a class="el" href="group__vars.html#g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1">vars.h</a><li>stp_image_conclude()
+: <a class="el" href="group__image.html#gd1017f2f9b91d7add73c2393d96f700a">image.h</a><li>stp_image_get_appname()
+: <a class="el" href="group__image.html#gd36123431e93e049d813894aa039c25c">image.h</a><li>stp_image_get_row()
+: <a class="el" href="group__image.html#gfc93a7a3f6629f6826bf1f6f757f464e">image.h</a><li>stp_image_height()
+: <a class="el" href="group__image.html#g48a99a9a8493b75687ad0900664ca4cb">image.h</a><li>stp_image_init()
+: <a class="el" href="group__image.html#g74c2417d571861506be7209421a3b418">image.h</a><li>stp_image_reset()
+: <a class="el" href="group__image.html#g69cd20ccb54500d0ee8cf38969db69a6">image.h</a><li>STP_IMAGE_STATUS_ABORT
+: <a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b">image.h</a><li>STP_IMAGE_STATUS_OK
+: <a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5">image.h</a><li>stp_image_status_t
+: <a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">image.h</a><li>stp_image_t
+: <a class="el" href="group__image.html#gc5b6b70cd39959ffd06deab3724d87e9">image.h</a><li>stp_image_width()
+: <a class="el" href="group__image.html#g9ee4915d4a1007f2d9c730ddc96d931b">image.h</a><li>stp_init()
+: <a class="el" href="group__util.html#g69354e5830712093045a4ba290a298f8">util.h</a><li>stp_init_debug_messages()
+: <a class="el" href="group__util.html#g26a43ceec27ca34bc49f4806900b4618">util.h</a><li>stp_initialize_printer_defaults()
+: <a class="el" href="group__printer.html#gc9aba62164667822fd9f110740bab570">printers.h</a><li>stp_initialize_weave()
+: <a class="el" href="weave_8h.html#9b72df98be9b9e25b42aca6ef5901d35">weave.h</a><li>stp_interface_age
+: <a class="el" href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac">gutenprint-version.h</a><li>STP_INTERFACE_AGE
+: <a class="el" href="group__version.html#gfd63347e8d3a71fa8384db59deabbde5">gutenprint-version.h</a><li>stp_known_papersizes()
+: <a class="el" href="group__papersize.html#g93eb4d6bc44914b3ea6b184e076a0853">paper.h</a><li>stp_list_copy()
+: <a class="el" href="group__list.html#g3bd2f5a42d3313287017bfe20859c2d9">list.h</a><li>stp_list_create()
+: <a class="el" href="group__list.html#gaf10e4bb8ce6a8b6f5f015475400eb1b">list.h</a><li>stp_list_destroy()
+: <a class="el" href="group__list.html#g1382e926901b5efa2356176826a96a1a">list.h</a><li>stp_list_get_copyfunc()
+: <a class="el" href="group__list.html#g310dd79907494b07d9005fbf50b9eb0c">list.h</a><li>stp_list_get_end()
+: <a class="el" href="group__list.html#g2ef0298e970fdb93955860e7ee3f878c">list.h</a><li>stp_list_get_freefunc()
+: <a class="el" href="group__list.html#g9d344e3c6874e6033f8fc71370678bcf">list.h</a><li>stp_list_get_item_by_index()
+: <a class="el" href="group__list.html#g9885458dd0f6e6fe5c88c4b2b0643e2a">list.h</a><li>stp_list_get_item_by_long_name()
+: <a class="el" href="group__list.html#gdbf12ab6f47d68f2605f211023c4f520">list.h</a><li>stp_list_get_item_by_name()
+: <a class="el" href="group__list.html#g0fd0ea2439ab2b0c9b9fb97f14c9a470">list.h</a><li>stp_list_get_length()
+: <a class="el" href="group__list.html#g013ca40ec7e5714fc5ee5f31ac5582bc">list.h</a><li>stp_list_get_long_namefunc()
+: <a class="el" href="group__list.html#ga95d8ace9b6ec71388007024c51865cb">list.h</a><li>stp_list_get_namefunc()
+: <a class="el" href="group__list.html#g468cc0a5dfb1bfbef9eebd8d4f644492">list.h</a><li>stp_list_get_sortfunc()
+: <a class="el" href="group__list.html#ga759fd3cb97b9f651424b8a8fb6bedaa">list.h</a><li>stp_list_get_start()
+: <a class="el" href="group__list.html#ga67c8173f8c7b2c40e3d6dde6578faec">list.h</a><li>stp_list_item_create()
+: <a class="el" href="group__list.html#g50f49648801707436012cd5dc66b1f8c">list.h</a><li>stp_list_item_destroy()
+: <a class="el" href="group__list.html#gde2acf279e8ea067fdc1f3f951d0b373">list.h</a><li>stp_list_item_get_data()
+: <a class="el" href="group__list.html#g5b7d8ffea5a806953a43aee961a60fe4">list.h</a><li>stp_list_item_next()
+: <a class="el" href="group__list.html#gea9c1b6daae518ebecd2981289c555f3">list.h</a><li>stp_list_item_prev()
+: <a class="el" href="group__list.html#gcee23493eafdfcfce51e2ccf29ebbf54">list.h</a><li>stp_list_item_set_data()
+: <a class="el" href="group__list.html#g1b5d2889a81d712c3ba024e53bfd0f38">list.h</a><li>stp_list_item_t
+: <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">list.h</a><li>stp_list_node_free_data()
+: <a class="el" href="group__list.html#gb357e17f729e41b4f96d6aada1be26b9">list.h</a><li>stp_list_set_copyfunc()
+: <a class="el" href="group__list.html#gec59dd3b87efc811ef2b6303102ed279">list.h</a><li>stp_list_set_freefunc()
+: <a class="el" href="group__list.html#gc103cb4ff8870b3a8d90b6ebcade2498">list.h</a><li>stp_list_set_long_namefunc()
+: <a class="el" href="group__list.html#g42bdba5fcb861bdf8facb9135039d9b8">list.h</a><li>stp_list_set_namefunc()
+: <a class="el" href="group__list.html#g97d7c6d659aa7d05bc54a349a07e10c0">list.h</a><li>stp_list_set_sortfunc()
+: <a class="el" href="group__list.html#gbad08ce8ef257dae054ea3816ae88fe7">list.h</a><li>stp_list_t
+: <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">list.h</a><li>STP_MAJOR_VERSION
+: <a class="el" href="group__version.html#g98b05dcc61492d413bb01421995f1421">gutenprint-version.h</a><li>stp_major_version
+: <a class="el" href="group__version.html#g19a4efe48689fb8f859d04e60bfe028f">gutenprint-version.h</a><li>stp_malloc()
+: <a class="el" href="group__util.html#g7c76d059684ee6dc5bdc06e4b3af18ef">util.h</a><li>STP_MAX_WEAVE
+: <a class="el" href="weave_8h.html#46ee59dd8e65c35e69ba8cfa94e90786">weave.h</a><li>stp_merge_printvars()
+: <a class="el" href="group__vars.html#gc970fc314c6418d9193d93c787b908d9">vars.h</a><li>STP_MICRO_VERSION
+: <a class="el" href="group__version.html#g02b38fef35caed8b676941e8dd8aadae">gutenprint-version.h</a><li>stp_micro_version
+: <a class="el" href="group__version.html#g24960731fb86305c31f0be5621ccb993">gutenprint-version.h</a><li>stp_minor_version
+: <a class="el" href="group__version.html#g66def32167cee385762282e36b60d3b7">gutenprint-version.h</a><li>STP_MINOR_VERSION
+: <a class="el" href="group__version.html#g26319655da45e42c3b498ae7db0bf62c">gutenprint-version.h</a><li>STP_MODULE
+: <a class="el" href="gutenprint-module_8h.html#47eb7c01a3f89d34af8ea0b2c9ca32a1">gutenprint-module.h</a><li>STP_MODULE_CLASS_COLOR
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0">module.h</a><li>STP_MODULE_CLASS_DITHER
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c">module.h</a><li>STP_MODULE_CLASS_FAMILY
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6">module.h</a><li>STP_MODULE_CLASS_INVALID
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452">module.h</a><li>STP_MODULE_CLASS_MISC
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01">module.h</a><li>stp_module_class_t
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">module.h</a><li>stp_module_close()
+: <a class="el" href="module_8h.html#8e114f6e561ea2a5c4186b31eea363ad">module.h</a><li>stp_module_exit()
+: <a class="el" href="module_8h.html#a5bfe6fda569e476ad52024d31eca3c4">module.h</a><li>stp_module_get_class()
+: <a class="el" href="module_8h.html#60ee652d3ddc0bf99abc8155b4e35a01">module.h</a><li>stp_module_init()
+: <a class="el" href="module_8h.html#8d52ac8df2ff7c4a28900fbb598c4848">module.h</a><li>stp_module_load()
+: <a class="el" href="module_8h.html#b07deb48be35f70644fcc6013b4debd9">module.h</a><li>stp_module_open()
+: <a class="el" href="module_8h.html#401000da13e2a7aacab2738838bf1fb2">module.h</a><li>stp_module_t
+: <a class="el" href="module_8h.html#1bc0723b8b43547b333980913ea42965">module.h</a><li>stp_module_version_t
+: <a class="el" href="module_8h.html#a6058b6828d19e60a3e6c86b242da863">module.h</a><li>STP_MXML_ADD_AFTER
+: <a class="el" href="mxml_8h.html#aef62f3dd5005be25edf46856ffd0e67">mxml.h</a><li>STP_MXML_ADD_BEFORE
+: <a class="el" href="mxml_8h.html#7ac1110fe031c1c8274171dda7c65ee8">mxml.h</a><li>STP_MXML_ADD_TO_PARENT
+: <a class="el" href="mxml_8h.html#7183b4ceb133647a5b559de1549356d1">mxml.h</a><li>stp_mxml_attr_t
+: <a class="el" href="mxml_8h.html#1ed814dbc1628ca237bed68e27043438">mxml.h</a><li>STP_MXML_DESCEND
+: <a class="el" href="mxml_8h.html#2ed08f4813ad57773f412970856517f5">mxml.h</a><li>STP_MXML_DESCEND_FIRST
+: <a class="el" href="mxml_8h.html#2692b08783d224aa4f726b13c4a7da68">mxml.h</a><li>STP_MXML_ELEMENT
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0">mxml.h</a><li>stp_mxml_element_t
+: <a class="el" href="mxml_8h.html#504a90f35ed408a7f80f6dbdadf45ae4">mxml.h</a><li>STP_MXML_INTEGER
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092">mxml.h</a><li>STP_MXML_NO_CALLBACK
+: <a class="el" href="mxml_8h.html#70032c4eda848436305b71f40cf913f7">mxml.h</a><li>STP_MXML_NO_DESCEND
+: <a class="el" href="mxml_8h.html#42831d4e1a69e57461d655f610bb995a">mxml.h</a><li>STP_MXML_NO_PARENT
+: <a class="el" href="mxml_8h.html#934b8d5744f37ba24d529a86f6e5f2e7">mxml.h</a><li>stp_mxml_node_t
+: <a class="el" href="mxml_8h.html#1d1a605dff310b7538b297c8e63b1d88">mxml.h</a><li>STP_MXML_OPAQUE
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d">mxml.h</a><li>STP_MXML_REAL
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d">mxml.h</a><li>STP_MXML_TAB
+: <a class="el" href="mxml_8h.html#24760270636887d4dbbccca15164f4eb">mxml.h</a><li>STP_MXML_TEXT
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6">mxml.h</a><li>stp_mxml_text_t
+: <a class="el" href="mxml_8h.html#a2b9c7f1c79258abe63be05529b2a908">mxml.h</a><li>stp_mxml_type_e
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1">mxml.h</a><li>stp_mxml_type_t
+: <a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">mxml.h</a><li>stp_mxml_value_t
+: <a class="el" href="mxml_8h.html#d162e4b65493580e8bee75ef0c8c12b6">mxml.h</a><li>STP_MXML_WRAP
+: <a class="el" href="mxml_8h.html#76508c60800b84b90acf4e0f8e04288e">mxml.h</a><li>STP_MXML_WS_AFTER_CLOSE
+: <a class="el" href="mxml_8h.html#1ffe9b0d18eb95e8b85da3d09b195aee">mxml.h</a><li>STP_MXML_WS_AFTER_OPEN
+: <a class="el" href="mxml_8h.html#312f2553f5c5e2f974ca8f238064dadd">mxml.h</a><li>STP_MXML_WS_BEFORE_CLOSE
+: <a class="el" href="mxml_8h.html#5ef0809e92527718236cf91e591f1276">mxml.h</a><li>STP_MXML_WS_BEFORE_OPEN
+: <a class="el" href="mxml_8h.html#85b05ecef2dd56e2d66b0c3057705a9b">mxml.h</a><li>stp_mxmlAdd()
+: <a class="el" href="mxml_8h.html#f5b1214c9e580debaf0350f31d03467d">mxml.h</a><li>stp_mxmlDelete()
+: <a class="el" href="mxml_8h.html#cbdf0579701e7776af87fbb3c2bf9469">mxml.h</a><li>stp_mxmlElementGetAttr()
+: <a class="el" href="mxml_8h.html#23f0ed075c389d9681fb5ed3c2ecddb9">mxml.h</a><li>stp_mxmlElementSetAttr()
+: <a class="el" href="mxml_8h.html#eae678d773da3b4075f1feea1b14eb84">mxml.h</a><li>stp_mxmlFindElement()
+: <a class="el" href="mxml_8h.html#7c0efd099878ce90b220bf4c51324cce">mxml.h</a><li>stp_mxmlLoadFile()
+: <a class="el" href="mxml_8h.html#db392c4e623e72d2b1985058564abf5d">mxml.h</a><li>stp_mxmlLoadString()
+: <a class="el" href="mxml_8h.html#9e275680a5730ef159757b20e041723d">mxml.h</a><li>stp_mxmlNewElement()
+: <a class="el" href="mxml_8h.html#305b60c2a9554ac30bb195e42cc82e75">mxml.h</a><li>stp_mxmlNewInteger()
+: <a class="el" href="mxml_8h.html#e65d5658c5271a9e26c5a21bc0cc2f20">mxml.h</a><li>stp_mxmlNewOpaque()
+: <a class="el" href="mxml_8h.html#533ea6ec53f37f8bdd2d89d667b0d10a">mxml.h</a><li>stp_mxmlNewReal()
+: <a class="el" href="mxml_8h.html#7754bd0d9af2be6edaeac7edf9c89c93">mxml.h</a><li>stp_mxmlNewText()
+: <a class="el" href="mxml_8h.html#41566f9adbe5fe307a4643e073e3d914">mxml.h</a><li>stp_mxmlRemove()
+: <a class="el" href="mxml_8h.html#6abe55831d77332db6b94b6cc0caaf02">mxml.h</a><li>stp_mxmlSaveAllocString()
+: <a class="el" href="mxml_8h.html#e3723cad1353a2142fc1abaee599380c">mxml.h</a><li>stp_mxmlSaveFile()
+: <a class="el" href="mxml_8h.html#bfabbd9dfdce248edc2f47de1faee7c3">mxml.h</a><li>stp_mxmlSaveString()
+: <a class="el" href="mxml_8h.html#18d0fb42d5adb6b4337df82e61116050">mxml.h</a><li>stp_mxmlWalkNext()
+: <a class="el" href="mxml_8h.html#be88dab827e68c48b822c6250731fc57">mxml.h</a><li>stp_mxmlWalkPrev()
+: <a class="el" href="mxml_8h.html#112485e5f15808619af7dd558528323f">mxml.h</a><li>STP_NCOLORS
+: <a class="el" href="dither_8h.html#3e02bef38f178e66a4439df6ec61c503">dither.h</a><li>stp_node_copyfunc
+: <a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">list.h</a><li>stp_node_freefunc
+: <a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">list.h</a><li>stp_node_namefunc
+: <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">list.h</a><li>stp_node_sortfunc
+: <a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">list.h</a><li>stp_outfunc_t
+: <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">vars.h</a><li>stp_pack_tiff
+: <a class="el" href="weave_8h.html#27cae2ded3a9434dd6f332dbf6721f71">weave.h</a><li>stp_pack_uncompressed
+: <a class="el" href="weave_8h.html#b81173e35f655b1a8f0047cbadce5391">weave.h</a><li>stp_packfunc
+: <a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">weave.h</a><li>stp_papersize_unit_t
+: <a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">paper.h</a><li>STP_PARAMETER_ACTIVE
+: <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99">vars.h</a><li>stp_parameter_activity_t
+: <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">vars.h</a><li>STP_PARAMETER_CLASS_CORE
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a">vars.h</a><li>stp_parameter_class_t
+: <a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">vars.h</a><li>STP_PARAMETER_DEFAULTED
+: <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136">vars.h</a><li>stp_parameter_description_destroy()
+: <a class="el" href="group__vars.html#gc5a3eb0348d31acf60772265c3896542">vars.h</a><li>stp_parameter_find()
+: <a class="el" href="group__vars.html#g3dea1f995d40482b9f6470fedd994f95">vars.h</a><li>stp_parameter_find_in_settings()
+: <a class="el" href="group__vars.html#g711cf3e5e52fd3434ef7a9d16654aea8">vars.h</a><li>STP_PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3">vars.h</a><li>stp_parameter_level_t
+: <a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">vars.h</a><li>stp_parameter_list_add_param()
+: <a class="el" href="group__vars.html#ga8dc4ff543dbc1882d673b25234088b6">vars.h</a><li>stp_parameter_list_append()
+: <a class="el" href="group__vars.html#gf8aa1d7aba11de5fdee95b9cb339be61">vars.h</a><li>stp_parameter_list_copy()
+: <a class="el" href="group__vars.html#g62c6225b0721d5c80d889edc307f0b6b">vars.h</a><li>stp_parameter_list_count()
+: <a class="el" href="group__vars.html#gf69f651a798e9f06c67baf06f0754228">vars.h</a><li>stp_parameter_list_create()
+: <a class="el" href="group__vars.html#g3c1ddd3c10c367c0912fdd841576278f">vars.h</a><li>stp_parameter_list_destroy()
+: <a class="el" href="group__vars.html#gd0f6c2b153638f551d7709780eb7276a">vars.h</a><li>stp_parameter_list_param()
+: <a class="el" href="group__vars.html#g96fc73864dfc00ae418f14a81c72be26">vars.h</a><li>stp_parameter_list_t
+: <a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81">vars.h</a><li>STP_PARAMETER_TYPE_FILE
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6">vars.h</a><li>STP_PARAMETER_TYPE_INT
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576">vars.h</a><li>STP_PARAMETER_TYPE_RAW
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2">vars.h</a><li>stp_parameter_type_t
+: <a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">vars.h</a><li>stp_parameter_verify_t
+: <a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">vars.h</a><li>stp_path_search()
+: <a class="el" href="path_8h.html#8591072873a5ee644a6dd22538d84c55">path.h</a><li>stp_path_split()
+: <a class="el" href="path_8h.html#bc40460305f1f4f972c08a439f406449">path.h</a><li>stp_print()
+: <a class="el" href="group__printer.html#g121125e6646c6f6d8965f1857450749e">printers.h</a><li>stp_printer_describe_parameter()
+: <a class="el" href="group__printer.html#g806f00d4167762c7a3d467ec37c8430e">printers.h</a><li>stp_printer_get_defaults()
+: <a class="el" href="group__printer.html#ge67398e65540b835f5c5d073c5ea0ec1">printers.h</a><li>stp_printer_get_driver()
+: <a class="el" href="group__printer.html#g6c6c426f86307660079277ab6e90ae3d">printers.h</a><li>stp_printer_get_family()
+: <a class="el" href="group__printer.html#g9c98ccc58b2c6f9ed6bd1025220ff77d">printers.h</a><li>stp_printer_get_long_name()
+: <a class="el" href="group__printer.html#g00182878bdc39935e6382d7e41d55294">printers.h</a><li>stp_printer_get_manufacturer()
+: <a class="el" href="group__printer.html#gfc0382fd32b49ea9d171e4ce8b750c62">printers.h</a><li>stp_printer_get_model()
+: <a class="el" href="group__printer.html#g7ba104f0ea5ce4a88175486894010b71">printers.h</a><li>stp_printer_list_parameters()
+: <a class="el" href="group__printer.html#g666486047edfe4405d003b5c3bbe4b49">printers.h</a><li>stp_printer_model_count()
+: <a class="el" href="group__printer.html#gc0a8108170f5c86621de14296fd94b1e">printers.h</a><li>stp_printer_t
+: <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">printers.h</a><li>stp_prune_inactive_options()
+: <a class="el" href="group__util.html#gf64336e7c536a51d0debe88f1f5ec90a">util.h</a><li>stp_put16_be()
+: <a class="el" href="group__util.html#g3c20beae37d9841e095b336d6f7dcc1d">util.h</a><li>stp_put16_le()
+: <a class="el" href="group__util.html#g01199dc1d5a3db973d22cc9db00a4f41">util.h</a><li>stp_put32_be()
+: <a class="el" href="group__util.html#gbe0e31fbc0c4e6374903b25edc594f5e">util.h</a><li>stp_put32_le()
+: <a class="el" href="group__util.html#g0a445c531388afa31650ef4ccdac3ae1">util.h</a><li>stp_putc()
+: <a class="el" href="group__util.html#gf07e31a63021b4d504cc5a410e1aeb08">util.h</a><li>stp_puts()
+: <a class="el" href="group__util.html#g0a59761c8a4ee5f31cfb9bec2a9b00b4">util.h</a><li>stp_read_and_compose_curves()
+: <a class="el" href="group__util.html#g21168356d466d278f11dab2be8d0016e">util.h</a><li>stp_realloc()
+: <a class="el" href="group__util.html#g908f11aeabf31c8a9621bd65d408a5fc">util.h</a><li>stp_register_xml_parser()
+: <a class="el" href="xml_8h.html#3258e11973b45c04e9ec1810789cface">xml.h</a><li>stp_register_xml_preload()
+: <a class="el" href="xml_8h.html#0377f341fce4c764d695b851cf90125c">xml.h</a><li>STP_SAFE_FREE
+: <a class="el" href="group__util.html#g44a234fbf1ab832399fc674c8cb53b1f">util.h</a><li>stp_scale_float_parameter()
+: <a class="el" href="group__vars.html#gec605c647cab13d61ab5e2822d9f7ead">vars.h</a><li>stp_send_command()
+: <a class="el" href="group__util.html#g23ee64de1ec6ef5a4941ab80ba609840">util.h</a><li>stp_sequence_copy()
+: <a class="el" href="group__sequence.html#g5792d6f821525514199dd2d9b332ddd4">sequence.h</a><li>stp_sequence_create()
+: <a class="el" href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee">sequence.h</a><li>stp_sequence_create_copy()
+: <a class="el" href="group__sequence.html#gd37eb66db88ac93b853ba6e02b9155bc">sequence.h</a><li>stp_sequence_create_from_xmltree()
+: <a class="el" href="xml_8h.html#174add090763cd3d8a019da75257e9c5">xml.h</a><li>stp_sequence_destroy()
+: <a class="el" href="group__sequence.html#g98c9c2859d2ebe9b1987d26b62bd6ce0">sequence.h</a><li>stp_sequence_get_bounds()
+: <a class="el" href="group__sequence.html#g392e1da122d95d6fc07b6d73eff1d311">sequence.h</a><li>stp_sequence_get_data()
+: <a class="el" href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199">sequence.h</a><li>stp_sequence_get_float_data()
+: <a class="el" href="group__sequence.html#gf8cd9da688af479103cf8600e48f61c9">sequence.h</a><li>stp_sequence_get_int_data()
+: <a class="el" href="group__sequence.html#g4396baf0d338eec6f3bce3e2000da978">sequence.h</a><li>stp_sequence_get_long_data()
+: <a class="el" href="group__sequence.html#g864b55caa3a8c0e573031a36f57f7cc4">sequence.h</a><li>stp_sequence_get_point()
+: <a class="el" href="group__sequence.html#g044210129f28c298152ce124371324d4">sequence.h</a><li>stp_sequence_get_range()
+: <a class="el" href="group__sequence.html#gc2c70c539a3eced45be306d082faa3a6">sequence.h</a><li>stp_sequence_get_short_data()
+: <a class="el" href="group__sequence.html#g91a68efd6b99150739c7706f65703a2f">sequence.h</a><li>stp_sequence_get_size()
+: <a class="el" href="group__sequence.html#g99292c5ba10bcf1574c3e71a593c3e5f">sequence.h</a><li>stp_sequence_get_uint_data()
+: <a class="el" href="group__sequence.html#g204f77e91c9283dc6ec6e742687bb0db">sequence.h</a><li>stp_sequence_get_ulong_data()
+: <a class="el" href="group__sequence.html#gc4557b9fba98a7fbb4e17cc18fb0dded">sequence.h</a><li>stp_sequence_get_ushort_data()
+: <a class="el" href="group__sequence.html#g8bf46faeea891ac7ca699591df596bc1">sequence.h</a><li>stp_sequence_set_bounds()
+: <a class="el" href="group__sequence.html#gd56df3112937c11431e033f2d9574b96">sequence.h</a><li>stp_sequence_set_data()
+: <a class="el" href="group__sequence.html#g24024e771a50db02f2713b244212603e">sequence.h</a><li>stp_sequence_set_float_data()
+: <a class="el" href="group__sequence.html#g34a526cb5e72b611ac8a98b559c24e2e">sequence.h</a><li>stp_sequence_set_int_data()
+: <a class="el" href="group__sequence.html#gd4f058b2c690ad4e326970cc841d8f79">sequence.h</a><li>stp_sequence_set_long_data()
+: <a class="el" href="group__sequence.html#gd15e2cf350bb311da58f4b11240fa0f2">sequence.h</a><li>stp_sequence_set_point()
+: <a class="el" href="group__sequence.html#gf7f49101192387e29399ded6d3166d13">sequence.h</a><li>stp_sequence_set_short_data()
+: <a class="el" href="group__sequence.html#ge0d6719f863a10422dea23e7f4b4dd29">sequence.h</a><li>stp_sequence_set_size()
+: <a class="el" href="group__sequence.html#g166e9a610bd53cb812e328d9e111f240">sequence.h</a><li>stp_sequence_set_subrange()
+: <a class="el" href="group__sequence.html#g9b41ba7e0f1fb00cf19bbb9efe70824d">sequence.h</a><li>stp_sequence_set_uint_data()
+: <a class="el" href="group__sequence.html#g40cd6256eb5bb72decd60edd1dc3be54">sequence.h</a><li>stp_sequence_set_ulong_data()
+: <a class="el" href="group__sequence.html#gbc7ec322716d761436e4ad2d5d2f756f">sequence.h</a><li>stp_sequence_set_ushort_data()
+: <a class="el" href="group__sequence.html#g68aed44bbf6ede9ac49237091f2deb43">sequence.h</a><li>stp_sequence_t
+: <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">sequence.h</a><li>stp_set_array_parameter()
+: <a class="el" href="group__vars.html#g1f63514f8ffd8ea56f0beee69398ee01">vars.h</a><li>stp_set_array_parameter_active()
+: <a class="el" href="group__vars.html#gf2aada3c00f9b00bc6a65014da87e250">vars.h</a><li>stp_set_boolean_parameter()
+: <a class="el" href="group__vars.html#g8f67ed7dcee969e77374fb4daf468d58">vars.h</a><li>stp_set_boolean_parameter_active()
+: <a class="el" href="group__vars.html#ge12a7edf773cbe04fb98b171ba2c2fb9">vars.h</a><li>stp_set_color_conversion()
+: <a class="el" href="group__vars.html#g335e7eb264fa22343765146fb2318b31">vars.h</a><li>stp_set_color_conversion_n()
+: <a class="el" href="group__vars.html#g3164aa99994dabb561d6c295eb647123">vars.h</a><li>stp_set_curve_parameter()
+: <a class="el" href="group__vars.html#g5f4adaadb80cd2d94569881d96cfa02e">vars.h</a><li>stp_set_curve_parameter_active()
+: <a class="el" href="group__vars.html#g160150a3a39d66f5a807d1c750a57890">vars.h</a><li>stp_set_default_array_parameter()
+: <a class="el" href="group__vars.html#ga1620e4be3c7fb85262802338d3143f6">vars.h</a><li>stp_set_default_boolean_parameter()
+: <a class="el" href="group__vars.html#gd286782f691998858e30a202506bad74">vars.h</a><li>stp_set_default_curve_parameter()
+: <a class="el" href="group__vars.html#gdd7769bfece8597cde869eced1239a1e">vars.h</a><li>stp_set_default_dimension_parameter()
+: <a class="el" href="group__vars.html#g18b8a4fb414245d2c30df9ee11057845">vars.h</a><li>stp_set_default_file_parameter()
+: <a class="el" href="group__vars.html#gae28e4c640fba005a72e92af66327b50">vars.h</a><li>stp_set_default_file_parameter_n()
+: <a class="el" href="group__vars.html#gdeae102d1bd65147221f56e6095f35ef">vars.h</a><li>stp_set_default_float_parameter()
+: <a class="el" href="group__vars.html#g59b79c779211a72de534fb9e61548f97">vars.h</a><li>stp_set_default_int_parameter()
+: <a class="el" href="group__vars.html#gbf1d9c938d364598414e9f15c41c1f08">vars.h</a><li>stp_set_default_raw_parameter()
+: <a class="el" href="group__vars.html#gf95184ecee86a92db2a7d3f050154a46">vars.h</a><li>stp_set_default_string_parameter()
+: <a class="el" href="group__vars.html#g71306c3e3118d9a4545b0a3cefb863ea">vars.h</a><li>stp_set_default_string_parameter_n()
+: <a class="el" href="group__vars.html#g65b18994af3384af04e2bf77e288f54f">vars.h</a><li>stp_set_dimension_parameter()
+: <a class="el" href="group__vars.html#g778b0e43aad1e011012b8071b469c694">vars.h</a><li>stp_set_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g6fa1953ee96051566a261f3391da3857">vars.h</a><li>stp_set_driver()
+: <a class="el" href="group__vars.html#ga8d9dbb1e613cfe2b119668158e35a76">vars.h</a><li>stp_set_driver_n()
+: <a class="el" href="group__vars.html#ge303a6ed77135b691ebbfd56cb577531">vars.h</a><li>stp_set_errdata()
+: <a class="el" href="group__vars.html#g7a006418c4dbb265be71f7b5a202455d">vars.h</a><li>stp_set_errfunc()
+: <a class="el" href="group__vars.html#ge89d8eb48e4a7a8107b87a44a4318064">vars.h</a><li>stp_set_file_parameter()
+: <a class="el" href="group__vars.html#g8134e4dc36b063a7d7dd229b9df32726">vars.h</a><li>stp_set_file_parameter_active()
+: <a class="el" href="group__vars.html#g8c04ab4487623a41e0b2600d466a88ad">vars.h</a><li>stp_set_file_parameter_n()
+: <a class="el" href="group__vars.html#g6e6c5474c253a452073eba25251a1481">vars.h</a><li>stp_set_float_parameter()
+: <a class="el" href="group__vars.html#g82f7bbcf639c60678c1dc2aee24e8a24">vars.h</a><li>stp_set_float_parameter_active()
+: <a class="el" href="group__vars.html#g38a95079fd6f90a0c6a92c5ddeb104ca">vars.h</a><li>stp_set_height()
+: <a class="el" href="group__vars.html#g68110f6d19b3987f6f66baee3926eb89">vars.h</a><li>stp_set_int_parameter()
+: <a class="el" href="group__vars.html#g8c6cd5f3bb3ab59a4f06c020c062c13e">vars.h</a><li>stp_set_int_parameter_active()
+: <a class="el" href="group__vars.html#g1c724bc85737bf8c698a08bc2d441b3e">vars.h</a><li>stp_set_left()
+: <a class="el" href="group__vars.html#g5d675ab9877df60ec467a20a0d62fcbc">vars.h</a><li>stp_set_outdata()
+: <a class="el" href="group__vars.html#g8fef23ae01a368f4d16ad95813d97d6d">vars.h</a><li>stp_set_outfunc()
+: <a class="el" href="group__vars.html#g30d5438686c8ead9a092f98bf3c3d8ca">vars.h</a><li>stp_set_output_codeset()
+: <a class="el" href="group__util.html#gf7978ce9e414b3d8ad905ee36a51cfbd">util.h</a><li>stp_set_page_height()
+: <a class="el" href="group__vars.html#g775714bf75f1fdbdd895f59edc9eca55">vars.h</a><li>stp_set_page_width()
+: <a class="el" href="group__vars.html#g751759cdeb8feb061c00f35d37fea45c">vars.h</a><li>stp_set_printer_defaults()
+: <a class="el" href="group__printer.html#gc3d8cdb65382cb13ea6b01072e6240d5">printers.h</a><li>stp_set_raw_parameter()
+: <a class="el" href="group__vars.html#gd40038a74fa7548da5fcaec6687c8787">vars.h</a><li>stp_set_raw_parameter_active()
+: <a class="el" href="group__vars.html#g9fe388535a67f8360ab21f58233c0e17">vars.h</a><li>stp_set_string_parameter()
+: <a class="el" href="group__vars.html#g22338d64a871a8b279fdee6fd83fff7f">vars.h</a><li>stp_set_string_parameter_active()
+: <a class="el" href="group__vars.html#g44793f2cf64b11917b8943d20ee43b9d">vars.h</a><li>stp_set_string_parameter_n()
+: <a class="el" href="group__vars.html#g5182246d4e0653f73dfaa40b62d4285f">vars.h</a><li>stp_set_top()
+: <a class="el" href="group__vars.html#gaa76e04fcde3aa6c162fb9d2fcaca251">vars.h</a><li>stp_set_verified()
+: <a class="el" href="group__vars.html#g8a2924dd6393431e994d22c704ec25fc">vars.h</a><li>stp_set_width()
+: <a class="el" href="group__vars.html#gdbdd8bad1742e87b5c5a299c2ebf7cf4">vars.h</a><li>stp_shade_t
+: <a class="el" href="dither_8h.html#737b4edb8992127d0616e78f6c0a4c14">dither.h</a><li>stp_split_2()
+: <a class="el" href="bit-ops_8h.html#65a4f2dc6c49d8a80e1d0ca72a1f0ffd">bit-ops.h</a><li>stp_split_4()
+: <a class="el" href="bit-ops_8h.html#24f21e067782cbb1606f4109f7acaccb">bit-ops.h</a><li>stp_start_job()
+: <a class="el" href="group__printer.html#g9cf59fba866430dd47508bac6561ef67">printers.h</a><li>stp_strdup()
+: <a class="el" href="group__util.html#g2f861f4a98ad496ca8cd995147867f32">util.h</a><li>stp_string_list_add_string()
+: <a class="el" href="string-list_8h.html#b9e6a3a7944ca10102b1a30a3acc6767">string-list.h</a><li>stp_string_list_count()
+: <a class="el" href="string-list_8h.html#023eaab359b2f3c22d1a4fa7013e01ef">string-list.h</a><li>stp_string_list_create()
+: <a class="el" href="string-list_8h.html#65077aa7201209fcaa58553d904fbc34">string-list.h</a><li>stp_string_list_create_copy()
+: <a class="el" href="string-list_8h.html#e2f7a65ea28e02e39cc223898137127b">string-list.h</a><li>stp_string_list_create_from_params()
+: <a class="el" href="string-list_8h.html#a4938d0cb58828f5d27086ae9c400857">string-list.h</a><li>stp_string_list_destroy()
+: <a class="el" href="string-list_8h.html#35638794468f0bb0dd7b912dac655bd5">string-list.h</a><li>stp_string_list_find()
+: <a class="el" href="string-list_8h.html#25fd88ec425121519cc25d5279d29e6f">string-list.h</a><li>stp_string_list_is_present()
+: <a class="el" href="string-list_8h.html#333d878e45062e5f3ef5cf63602f4ce3">string-list.h</a><li>stp_string_list_param()
+: <a class="el" href="string-list_8h.html#997c38e27e8ad480118b84a6fdca4d79">string-list.h</a><li>stp_string_list_remove_string()
+: <a class="el" href="string-list_8h.html#26d7d318ddcbe976df1c91134d1ab262">string-list.h</a><li>stp_string_list_t
+: <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">string-list.h</a><li>stp_strlen()
+: <a class="el" href="group__util.html#g054943d301baecba82cdb78b7e454880">util.h</a><li>stp_strndup()
+: <a class="el" href="group__util.html#g2c6b28a35780bfa7d03a2f8381ee82c2">util.h</a><li>stp_unpack_16()
+: <a class="el" href="bit-ops_8h.html#d472146a7bdf6c1e95bcb102c4409515">bit-ops.h</a><li>stp_unpack_2()
+: <a class="el" href="bit-ops_8h.html#9772ac792d8208e341d780fc756bf3cd">bit-ops.h</a><li>stp_unpack_4()
+: <a class="el" href="bit-ops_8h.html#7fdd081b1a58cdc3648e61d23aefb744">bit-ops.h</a><li>stp_unpack_8()
+: <a class="el" href="bit-ops_8h.html#534a4a10cda717aabaf212954cc2d891">bit-ops.h</a><li>stp_unregister_xml_parser()
+: <a class="el" href="xml_8h.html#bdff70654d8ca31445e0957cfad68816">xml.h</a><li>stp_unregister_xml_preload()
+: <a class="el" href="xml_8h.html#f9605dfeaf5ba8c41b42aba2c09b4f20">xml.h</a><li>stp_vars_copy()
+: <a class="el" href="group__vars.html#g165ae58fed1515b5466ab1b84df85a86">vars.h</a><li>stp_vars_create()
+: <a class="el" href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a">vars.h</a><li>stp_vars_create_copy()
+: <a class="el" href="group__vars.html#g3c6d765cc5a27b322289e9baa9d97098">vars.h</a><li>stp_vars_destroy()
+: <a class="el" href="group__vars.html#g78259fcaa881655a07ef0b2b457bdf70">vars.h</a><li>stp_vars_t
+: <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">vars.h</a><li>stp_verify()
+: <a class="el" href="group__vars.html#ge28b0d78641811b1625a52971a2d11fa">vars.h</a><li>stp_verify_parameter()
+: <a class="el" href="group__vars.html#gf64e586fca554f2dd65157a76eaad34a">vars.h</a><li>stp_verify_printer_params()
+: <a class="el" href="group__printer.html#gd91f8e7a622725f0d47196cf912ddd8d">printers.h</a><li>STP_WEAVE_ASCENDING
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d">weave.h</a><li>STP_WEAVE_ASCENDING_2X
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12">weave.h</a><li>STP_WEAVE_ASCENDING_3X
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b">weave.h</a><li>STP_WEAVE_DESCENDING
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f">weave.h</a><li>stp_weave_parameters_by_row()
+: <a class="el" href="weave_8h.html#3dbb20fd24c73c2982819b1f184b7ee3">weave.h</a><li>STP_WEAVE_STAGGERED
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501">weave.h</a><li>stp_weave_strategy_t
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027">weave.h</a><li>STP_WEAVE_ZIGZAG
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc">weave.h</a><li>stp_write_weave()
+: <a class="el" href="weave_8h.html#b021ec20fafa48e57495123df1533b62">weave.h</a><li>stp_xml_exit()
+: <a class="el" href="xml_8h.html#d35445001b4f0ff02b45cf411b056cb2">xml.h</a><li>stp_xml_get_node()
+: <a class="el" href="xml_8h.html#acec0c2b6d806a70b74c2c9efb5ca895">xml.h</a><li>stp_xml_init()
+: <a class="el" href="xml_8h.html#e279cdb2639cb00884563204c586e34a">xml.h</a><li>stp_xml_init_defaults()
+: <a class="el" href="xml_8h.html#9e2620e798edcd889cd80454374a0a1d">xml.h</a><li>stp_xml_parse_file()
+: <a class="el" href="xml_8h.html#477e8c523df78a068e98be5e929d6825">xml.h</a><li>stp_xml_parse_file_named()
+: <a class="el" href="xml_8h.html#2ff6722b18cd21c91e60e7ef1cedc0d4">xml.h</a><li>stp_xml_parse_func
+: <a class="el" href="xml_8h.html#ec3dca5a8c562175532452b7a055200f">xml.h</a><li>stp_xml_preinit()
+: <a class="el" href="xml_8h.html#e2aeb50ec9bffd4cc7ff4b8756ce503a">xml.h</a><li>stp_xmldoc_create_generic()
+: <a class="el" href="xml_8h.html#d698808efae24e1f0002243256171fc0">xml.h</a><li>stp_xmlstrtod()
+: <a class="el" href="xml_8h.html#666632a9a3cb7f802fd5478d68d57166">xml.h</a><li>stp_xmlstrtol()
+: <a class="el" href="xml_8h.html#56885d576d38f8fbffce10834e892117">xml.h</a><li>stp_xmlstrtoul()
+: <a class="el" href="xml_8h.html#9d7f6cba6d4f5b8b01b6d3c192d10596">xml.h</a><li>stp_xmltree_create_from_array()
+: <a class="el" href="xml_8h.html#90e7cdadf10d6492082fd008b79853b0">xml.h</a><li>stp_xmltree_create_from_curve()
+: <a class="el" href="xml_8h.html#286050c77ae8ee255a7b6035b88d5fb4">xml.h</a><li>stp_xmltree_create_from_sequence()
+: <a class="el" href="xml_8h.html#134d8ffe83aa1bc29ca65869af337479">xml.h</a><li>stp_zalloc()
+: <a class="el" href="group__util.html#gae1d98650ef9777ae4f4b10eae60b5c9">util.h</a><li>stp_zfwrite()
+: <a class="el" href="group__util.html#g9135d4c8cac78593aff55b668d09b79c">util.h</a><li>stp_zprintf()
+: <a class="el" href="group__util.html#g18aaa3874e4dd5259a4d182fa8d9c90a">util.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_0x74.html b/doc/gutenprint/html/globals_0x74.html
index d1748e8..d53778f 100644
--- a/doc/gutenprint/html/globals_0x74.html
+++ b/doc/gutenprint/html/globals_0x74.html
@@ -2,20 +2,56 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"> | <a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="globals.html#index__">_</a> | <a class="qindex" href="globals_0x62.html#index_b">b</a> | <a class="qindex" href="globals_0x63.html#index_c">c</a> | <a class="qindex" href="globals_0x64.html#index_d">d</a> | <a class="qindex" href="globals_0x67.html#index_g">g</a> | <a class="qindex" href="globals_0x6e.html#index_n">n</a> | <a class="qindex" href="globals_0x70.html#index_p">p</a> | <a class="qindex" href="globals_0x73.html#index_s">s</a> | <a class="qindexHL" href="globals_0x74.html#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html#index__"><span>_</span></a></li>
+    <li><a href="globals_0x62.html#index_b"><span>b</span></a></li>
+    <li><a href="globals_0x63.html#index_c"><span>c</span></a></li>
+    <li><a href="globals_0x64.html#index_d"><span>d</span></a></li>
+    <li><a href="globals_0x67.html#index_g"><span>g</span></a></li>
+    <li><a href="globals_0x6e.html#index_n"><span>n</span></a></li>
+    <li><a href="globals_0x70.html#index_p"><span>p</span></a></li>
+    <li><a href="globals_0x73.html#index_s"><span>s</span></a></li>
+    <li id="current"><a href="globals_0x74.html#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
-: <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#gac0316f33cabc5a70d974c5aba43063b">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#gac0316f33cabc5a70d974c5aba43063b">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_defs.html b/doc/gutenprint/html/globals_defs.html
index c7c04e8..9f018cb 100644
--- a/doc/gutenprint/html/globals_defs.html
+++ b/doc/gutenprint/html/globals_defs.html
@@ -2,94 +2,129 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindexHL" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_d">d</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li id="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index__"><span>_</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_d"><span>d</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_
-: <a class="el" href="group__intl.html#ga5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga5">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl.html#gd41443e9a10bd2ffa9508bb74c41c2d1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#gd41443e9a10bd2ffa9508bb74c41c2d1">gutenprint-intl-internal.h</a></ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>bindtextdomain
-: <a class="el" href="group__intl.html#ga4">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga4">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl.html#gcf29daa2fef5f417c57be476054c695b">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#gcf29daa2fef5f417c57be476054c695b">gutenprint-intl-internal.h</a></ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>CURVE_CACHE_FAST_COUNT
-: <a class="el" href="curve-cache_8h.html#a2">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
-: <a class="el" href="curve-cache_8h.html#a1">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
-: <a class="el" href="curve-cache_8h.html#a0">curve-cache.h</a></ul>
+: <a class="el" href="curve-cache_8h.html#b8c3f0a2734a4bdb08989cc62761e8e7">curve-cache.h</a><li>CURVE_CACHE_FAST_DOUBLE
+: <a class="el" href="curve-cache_8h.html#b434b6a3a8ce63d95d11b2bce6360536">curve-cache.h</a><li>CURVE_CACHE_FAST_USHORT
+: <a class="el" href="curve-cache_8h.html#c0763605d9b80d9889407dd340e357fd">curve-cache.h</a></ul>
 <h3><a class="anchor" name="index_d">- d -</a></h3><ul>
 <li>dcgettext
-: <a class="el" href="group__intl.html#ga3">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga3">gutenprint-intl-internal.h</a><li>dgettext
-: <a class="el" href="group__intl.html#ga2">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga2">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl.html#g52d955a76a73f0e86dddd07dda5cd490">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#g52d955a76a73f0e86dddd07dda5cd490">gutenprint-intl-internal.h</a><li>dgettext
+: <a class="el" href="group__intl.html#g7fd6ec2ffaa95339754232b69eaac521">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#g7fd6ec2ffaa95339754232b69eaac521">gutenprint-intl-internal.h</a></ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gettext
-: <a class="el" href="group__intl.html#ga1">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga1">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl.html#geb8333d9b46653f2047c603034d26730">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#geb8333d9b46653f2047c603034d26730">gutenprint-intl-internal.h</a></ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>N_
-: <a class="el" href="group__intl.html#ga6">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga6">gutenprint-intl-internal.h</a></ul>
+: <a class="el" href="group__intl.html#g9de9caf5267f08d8164404a1f68b66f5">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#g9de9caf5267f08d8164404a1f68b66f5">gutenprint-intl-internal.h</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>STP_BINARY_AGE
-: <a class="el" href="group__version.html#ga11">gutenprint-version.h</a><li>STP_CHANNEL_LIMIT
-: <a class="el" href="group__image.html#ga16">image.h</a><li>STP_CHECK_VERSION
-: <a class="el" href="group__version.html#ga13">gutenprint-version.h</a><li>STP_CURRENT_INTERFACE
-: <a class="el" href="group__version.html#ga10">gutenprint-version.h</a><li>STP_DBG_CANON
-: <a class="el" href="group__util.html#ga39">util.h</a><li>STP_DBG_COLORFUNC
-: <a class="el" href="group__util.html#ga34">util.h</a><li>STP_DBG_CURVE
-: <a class="el" href="group__util.html#ga52">util.h</a><li>STP_DBG_CURVE_ERRORS
-: <a class="el" href="group__util.html#ga53">util.h</a><li>STP_DBG_ESCP2
-: <a class="el" href="group__util.html#ga38">util.h</a><li>STP_DBG_INK
-: <a class="el" href="group__util.html#ga35">util.h</a><li>STP_DBG_LEXMARK
-: <a class="el" href="group__util.html#ga40">util.h</a><li>STP_DBG_LIST
-: <a class="el" href="group__util.html#ga44">util.h</a><li>STP_DBG_LUT
-: <a class="el" href="group__util.html#ga33">util.h</a><li>STP_DBG_MARK_FILE
-: <a class="el" href="group__util.html#ga43">util.h</a><li>STP_DBG_MODULE
-: <a class="el" href="group__util.html#ga45">util.h</a><li>STP_DBG_OLYMPUS
-: <a class="el" href="group__util.html#ga51">util.h</a><li>STP_DBG_PAPER
-: <a class="el" href="group__util.html#ga47">util.h</a><li>STP_DBG_PATH
-: <a class="el" href="group__util.html#ga46">util.h</a><li>STP_DBG_PCL
-: <a class="el" href="group__util.html#ga37">util.h</a><li>STP_DBG_PRINTERS
-: <a class="el" href="group__util.html#ga48">util.h</a><li>STP_DBG_PS
-: <a class="el" href="group__util.html#ga36">util.h</a><li>STP_DBG_ROWS
-: <a class="el" href="group__util.html#ga42">util.h</a><li>STP_DBG_VARS
-: <a class="el" href="group__util.html#ga50">util.h</a><li>STP_DBG_WEAVE_PARAMS
-: <a class="el" href="group__util.html#ga41">util.h</a><li>STP_DBG_XML
-: <a class="el" href="group__util.html#ga49">util.h</a><li>STP_ECOLOR_C
-: <a class="el" href="dither_8h.html#a1">dither.h</a><li>STP_ECOLOR_K
-: <a class="el" href="dither_8h.html#a0">dither.h</a><li>STP_ECOLOR_M
-: <a class="el" href="dither_8h.html#a2">dither.h</a><li>STP_ECOLOR_Y
-: <a class="el" href="dither_8h.html#a3">dither.h</a><li>STP_INTERFACE_AGE
-: <a class="el" href="group__version.html#ga12">gutenprint-version.h</a><li>STP_MAJOR_VERSION
-: <a class="el" href="group__version.html#ga7">gutenprint-version.h</a><li>STP_MAX_WEAVE
-: <a class="el" href="weave_8h.html#a0">weave.h</a><li>STP_MICRO_VERSION
-: <a class="el" href="group__version.html#ga9">gutenprint-version.h</a><li>STP_MINOR_VERSION
-: <a class="el" href="group__version.html#ga8">gutenprint-version.h</a><li>STP_MODULE
-: <a class="el" href="gutenprint-module_8h.html#a0">gutenprint-module.h</a><li>STP_MXML_ADD_AFTER
-: <a class="el" href="mxml_8h.html#a12">mxml.h</a><li>STP_MXML_ADD_BEFORE
-: <a class="el" href="mxml_8h.html#a11">mxml.h</a><li>STP_MXML_ADD_TO_PARENT
-: <a class="el" href="mxml_8h.html#a13">mxml.h</a><li>STP_MXML_DESCEND
-: <a class="el" href="mxml_8h.html#a4">mxml.h</a><li>STP_MXML_DESCEND_FIRST
-: <a class="el" href="mxml_8h.html#a6">mxml.h</a><li>STP_MXML_NO_CALLBACK
-: <a class="el" href="mxml_8h.html#a2">mxml.h</a><li>STP_MXML_NO_DESCEND
-: <a class="el" href="mxml_8h.html#a5">mxml.h</a><li>STP_MXML_NO_PARENT
-: <a class="el" href="mxml_8h.html#a3">mxml.h</a><li>STP_MXML_TAB
-: <a class="el" href="mxml_8h.html#a1">mxml.h</a><li>STP_MXML_WRAP
-: <a class="el" href="mxml_8h.html#a0">mxml.h</a><li>STP_MXML_WS_AFTER_CLOSE
-: <a class="el" href="mxml_8h.html#a10">mxml.h</a><li>STP_MXML_WS_AFTER_OPEN
-: <a class="el" href="mxml_8h.html#a8">mxml.h</a><li>STP_MXML_WS_BEFORE_CLOSE
-: <a class="el" href="mxml_8h.html#a9">mxml.h</a><li>STP_MXML_WS_BEFORE_OPEN
-: <a class="el" href="mxml_8h.html#a7">mxml.h</a><li>STP_NCOLORS
-: <a class="el" href="dither_8h.html#a4">dither.h</a><li>STP_SAFE_FREE
-: <a class="el" href="group__util.html#ga54">util.h</a></ul>
+: <a class="el" href="group__version.html#ge754fd2fde377ba0bbe61aee1a31dd9a">gutenprint-version.h</a><li>STP_CHANNEL_LIMIT
+: <a class="el" href="group__image.html#gf71d7111a7215d4c1f1ef1317f9d6cfc">image.h</a><li>STP_CHECK_VERSION
+: <a class="el" href="group__version.html#g26c662a55c391d11663052ca39458972">gutenprint-version.h</a><li>STP_CURRENT_INTERFACE
+: <a class="el" href="group__version.html#g08cdc7e05ec4d52b2458470b6d0047fb">gutenprint-version.h</a><li>STP_DBG_CANON
+: <a class="el" href="group__util.html#ga0d6b1a8d780b3c5f970454678bc0323">util.h</a><li>STP_DBG_COLORFUNC
+: <a class="el" href="group__util.html#g3560e33ba80d2a0ceb07fe51fac845be">util.h</a><li>STP_DBG_CURVE
+: <a class="el" href="group__util.html#g9eaf8d50f127cd4316bf68ad34092551">util.h</a><li>STP_DBG_CURVE_ERRORS
+: <a class="el" href="group__util.html#gc80b8553e636ec01fe4e975d9f7668b9">util.h</a><li>STP_DBG_ESCP2
+: <a class="el" href="group__util.html#g158e1ea4acff071440681ba678b6fb0b">util.h</a><li>STP_DBG_INK
+: <a class="el" href="group__util.html#g328a4b66d0767134649ce30b243931c9">util.h</a><li>STP_DBG_LEXMARK
+: <a class="el" href="group__util.html#gb8180ab505c2d7c5a717a53096ac770c">util.h</a><li>STP_DBG_LIST
+: <a class="el" href="group__util.html#gcb3d85de1088cf795cfeaa9e1450c4e0">util.h</a><li>STP_DBG_LUT
+: <a class="el" href="group__util.html#g9ef88b326f83d342849fa89c33c7e4a7">util.h</a><li>STP_DBG_MARK_FILE
+: <a class="el" href="group__util.html#g9c8f6255efb1fcf9cd3e7a68466e44ba">util.h</a><li>STP_DBG_MODULE
+: <a class="el" href="group__util.html#g6d69d079a3d7a3e0e2b870e1e9417187">util.h</a><li>STP_DBG_OLYMPUS
+: <a class="el" href="group__util.html#g4dc6609c9bb0c256fec7361f41a5c45f">util.h</a><li>STP_DBG_PAPER
+: <a class="el" href="group__util.html#g08f48f3423e848f1932435c5f8e94ff7">util.h</a><li>STP_DBG_PATH
+: <a class="el" href="group__util.html#gb11ef5f0ed150be2d3b999b7fc7e4f24">util.h</a><li>STP_DBG_PCL
+: <a class="el" href="group__util.html#g30a9efd31b78debefd550d0b337ec795">util.h</a><li>STP_DBG_PRINTERS
+: <a class="el" href="group__util.html#g7bbbf3d31a1a4f6b0da808184e1c1587">util.h</a><li>STP_DBG_PS
+: <a class="el" href="group__util.html#g8d8211f97675b37f18bff822757d04b3">util.h</a><li>STP_DBG_ROWS
+: <a class="el" href="group__util.html#gb764d477ebf0db4957cc316badac70bd">util.h</a><li>STP_DBG_VARS
+: <a class="el" href="group__util.html#g52844a51058ca29f975b5666743622ac">util.h</a><li>STP_DBG_WEAVE_PARAMS
+: <a class="el" href="group__util.html#gc746369f247dc346bcbdeacb1abbdbcb">util.h</a><li>STP_DBG_XML
+: <a class="el" href="group__util.html#g51aee81a3d2a33d42417f6b61bb63f5e">util.h</a><li>STP_ECOLOR_C
+: <a class="el" href="dither_8h.html#575ca9b45d518b92177323e70295198a">dither.h</a><li>STP_ECOLOR_K
+: <a class="el" href="dither_8h.html#4faa7aec0dc7471ed5a7d1622991ac77">dither.h</a><li>STP_ECOLOR_M
+: <a class="el" href="dither_8h.html#c7f1f45ff56dfbaff0a36599c6bf822c">dither.h</a><li>STP_ECOLOR_Y
+: <a class="el" href="dither_8h.html#e1492502d48a830e5dda11f1d7afb494">dither.h</a><li>STP_INTERFACE_AGE
+: <a class="el" href="group__version.html#gfd63347e8d3a71fa8384db59deabbde5">gutenprint-version.h</a><li>STP_MAJOR_VERSION
+: <a class="el" href="group__version.html#g98b05dcc61492d413bb01421995f1421">gutenprint-version.h</a><li>STP_MAX_WEAVE
+: <a class="el" href="weave_8h.html#46ee59dd8e65c35e69ba8cfa94e90786">weave.h</a><li>STP_MICRO_VERSION
+: <a class="el" href="group__version.html#g02b38fef35caed8b676941e8dd8aadae">gutenprint-version.h</a><li>STP_MINOR_VERSION
+: <a class="el" href="group__version.html#g26319655da45e42c3b498ae7db0bf62c">gutenprint-version.h</a><li>STP_MODULE
+: <a class="el" href="gutenprint-module_8h.html#47eb7c01a3f89d34af8ea0b2c9ca32a1">gutenprint-module.h</a><li>STP_MXML_ADD_AFTER
+: <a class="el" href="mxml_8h.html#aef62f3dd5005be25edf46856ffd0e67">mxml.h</a><li>STP_MXML_ADD_BEFORE
+: <a class="el" href="mxml_8h.html#7ac1110fe031c1c8274171dda7c65ee8">mxml.h</a><li>STP_MXML_ADD_TO_PARENT
+: <a class="el" href="mxml_8h.html#7183b4ceb133647a5b559de1549356d1">mxml.h</a><li>STP_MXML_DESCEND
+: <a class="el" href="mxml_8h.html#2ed08f4813ad57773f412970856517f5">mxml.h</a><li>STP_MXML_DESCEND_FIRST
+: <a class="el" href="mxml_8h.html#2692b08783d224aa4f726b13c4a7da68">mxml.h</a><li>STP_MXML_NO_CALLBACK
+: <a class="el" href="mxml_8h.html#70032c4eda848436305b71f40cf913f7">mxml.h</a><li>STP_MXML_NO_DESCEND
+: <a class="el" href="mxml_8h.html#42831d4e1a69e57461d655f610bb995a">mxml.h</a><li>STP_MXML_NO_PARENT
+: <a class="el" href="mxml_8h.html#934b8d5744f37ba24d529a86f6e5f2e7">mxml.h</a><li>STP_MXML_TAB
+: <a class="el" href="mxml_8h.html#24760270636887d4dbbccca15164f4eb">mxml.h</a><li>STP_MXML_WRAP
+: <a class="el" href="mxml_8h.html#76508c60800b84b90acf4e0f8e04288e">mxml.h</a><li>STP_MXML_WS_AFTER_CLOSE
+: <a class="el" href="mxml_8h.html#1ffe9b0d18eb95e8b85da3d09b195aee">mxml.h</a><li>STP_MXML_WS_AFTER_OPEN
+: <a class="el" href="mxml_8h.html#312f2553f5c5e2f974ca8f238064dadd">mxml.h</a><li>STP_MXML_WS_BEFORE_CLOSE
+: <a class="el" href="mxml_8h.html#5ef0809e92527718236cf91e591f1276">mxml.h</a><li>STP_MXML_WS_BEFORE_OPEN
+: <a class="el" href="mxml_8h.html#85b05ecef2dd56e2d66b0c3057705a9b">mxml.h</a><li>STP_NCOLORS
+: <a class="el" href="dither_8h.html#3e02bef38f178e66a4439df6ec61c503">dither.h</a><li>STP_SAFE_FREE
+: <a class="el" href="group__util.html#g44a234fbf1ab832399fc674c8cb53b1f">util.h</a></ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>textdomain
-: <a class="el" href="group__intl.html#ga0">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#ga0">gutenprint-intl-internal.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__intl.html#gac0316f33cabc5a70d974c5aba43063b">gutenprint-intl.h</a>, <a class="el" href="group__intl__internal.html#gac0316f33cabc5a70d974c5aba43063b">gutenprint-intl-internal.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_enum.html b/doc/gutenprint/html/globals_enum.html
index f58daab..c61d7cd 100644
--- a/doc/gutenprint/html/globals_enum.html
+++ b/doc/gutenprint/html/globals_enum.html
@@ -2,30 +2,54 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindexHL" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li id="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>stp_curve_bounds_t
-: <a class="el" href="group__curve.html#ga50">curve.h</a><li>stp_curve_compose_t
-: <a class="el" href="group__curve.html#ga49">curve.h</a><li>stp_curve_type_t
-: <a class="el" href="group__curve.html#ga47">curve.h</a><li>stp_curve_wrap_mode_t
-: <a class="el" href="group__curve.html#ga48">curve.h</a><li>stp_image_status_t
-: <a class="el" href="group__image.html#ga17">image.h</a><li>stp_module_class_t
-: <a class="el" href="module_8h.html#a13">module.h</a><li>stp_mxml_type_e
-: <a class="el" href="mxml_8h.html#a43">mxml.h</a><li>stp_papersize_unit_t
-: <a class="el" href="group__papersize.html#ga5">paper.h</a><li>stp_parameter_activity_t
-: <a class="el" href="group__vars.html#ga135">vars.h</a><li>stp_parameter_class_t
-: <a class="el" href="group__vars.html#ga133">vars.h</a><li>stp_parameter_level_t
-: <a class="el" href="group__vars.html#ga134">vars.h</a><li>stp_parameter_type_t
-: <a class="el" href="group__vars.html#ga132">vars.h</a><li>stp_parameter_verify_t
-: <a class="el" href="group__vars.html#ga136">vars.h</a><li>stp_weave_strategy_t
-: <a class="el" href="weave_8h.html#a26">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">curve.h</a><li>stp_curve_compose_t
+: <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">curve.h</a><li>stp_curve_type_t
+: <a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">curve.h</a><li>stp_curve_wrap_mode_t
+: <a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">curve.h</a><li>stp_image_status_t
+: <a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">image.h</a><li>stp_module_class_t
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">module.h</a><li>stp_mxml_type_e
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1">mxml.h</a><li>stp_papersize_unit_t
+: <a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">paper.h</a><li>stp_parameter_activity_t
+: <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">vars.h</a><li>stp_parameter_class_t
+: <a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">vars.h</a><li>stp_parameter_level_t
+: <a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">vars.h</a><li>stp_parameter_type_t
+: <a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">vars.h</a><li>stp_parameter_verify_t
+: <a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">vars.h</a><li>stp_weave_strategy_t
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027">weave.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_eval.html b/doc/gutenprint/html/globals_eval.html
index eb84d7a..24b8a40 100644
--- a/doc/gutenprint/html/globals_eval.html
+++ b/doc/gutenprint/html/globals_eval.html
@@ -2,82 +2,111 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindexHL" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li id="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>PAPERSIZE_ENGLISH_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a2">paper.h</a><li>PAPERSIZE_ENGLISH_STANDARD
-: <a class="el" href="group__papersize.html#gga5a0">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
-: <a class="el" href="group__papersize.html#gga5a3">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
-: <a class="el" href="group__papersize.html#gga5a1">paper.h</a><li>PARAMETER_BAD
-: <a class="el" href="group__vars.html#gga136a33">vars.h</a><li>PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga136a35">vars.h</a><li>PARAMETER_OK
-: <a class="el" href="group__vars.html#gga136a34">vars.h</a></ul>
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d">paper.h</a><li>PAPERSIZE_ENGLISH_STANDARD
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65">paper.h</a><li>PAPERSIZE_METRIC_EXTENDED
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a">paper.h</a><li>PAPERSIZE_METRIC_STANDARD
+: <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35">paper.h</a><li>PARAMETER_BAD
+: <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25">vars.h</a><li>PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9">vars.h</a><li>PARAMETER_OK
+: <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333">vars.h</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>STP_CURVE_BOUNDS_CLIP
-: <a class="el" href="group__curve.html#gga50a9">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
-: <a class="el" href="group__curve.html#gga50a10">curve.h</a><li>STP_CURVE_BOUNDS_RESCALE
-: <a class="el" href="group__curve.html#gga50a8">curve.h</a><li>STP_CURVE_COMPOSE_ADD
-: <a class="el" href="group__curve.html#gga49a5">curve.h</a><li>STP_CURVE_COMPOSE_EXPONENTIATE
-: <a class="el" href="group__curve.html#gga49a7">curve.h</a><li>STP_CURVE_COMPOSE_MULTIPLY
-: <a class="el" href="group__curve.html#gga49a6">curve.h</a><li>STP_CURVE_TYPE_LINEAR
-: <a class="el" href="group__curve.html#gga47a1">curve.h</a><li>STP_CURVE_TYPE_SPLINE
-: <a class="el" href="group__curve.html#gga47a2">curve.h</a><li>STP_CURVE_WRAP_AROUND
-: <a class="el" href="group__curve.html#gga48a4">curve.h</a><li>STP_CURVE_WRAP_NONE
-: <a class="el" href="group__curve.html#gga48a3">curve.h</a><li>STP_IMAGE_STATUS_ABORT
-: <a class="el" href="group__image.html#gga17a8">image.h</a><li>STP_IMAGE_STATUS_OK
-: <a class="el" href="group__image.html#gga17a2">image.h</a><li>STP_MODULE_CLASS_COLOR
-: <a class="el" href="module_8h.html#a13a5">module.h</a><li>STP_MODULE_CLASS_DITHER
-: <a class="el" href="module_8h.html#a13a6">module.h</a><li>STP_MODULE_CLASS_FAMILY
-: <a class="el" href="module_8h.html#a13a4">module.h</a><li>STP_MODULE_CLASS_INVALID
-: <a class="el" href="module_8h.html#a13a2">module.h</a><li>STP_MODULE_CLASS_MISC
-: <a class="el" href="module_8h.html#a13a3">module.h</a><li>STP_MXML_ELEMENT
-: <a class="el" href="mxml_8h.html#a43a20">mxml.h</a><li>STP_MXML_INTEGER
-: <a class="el" href="mxml_8h.html#a43a21">mxml.h</a><li>STP_MXML_OPAQUE
-: <a class="el" href="mxml_8h.html#a43a22">mxml.h</a><li>STP_MXML_REAL
-: <a class="el" href="mxml_8h.html#a43a23">mxml.h</a><li>STP_MXML_TEXT
-: <a class="el" href="mxml_8h.html#a43a24">mxml.h</a><li>STP_PARAMETER_ACTIVE
-: <a class="el" href="group__vars.html#gga135a32">vars.h</a><li>STP_PARAMETER_CLASS_CORE
-: <a class="el" href="group__vars.html#gga133a19">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
-: <a class="el" href="group__vars.html#gga133a17">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
-: <a class="el" href="group__vars.html#gga133a20">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
-: <a class="el" href="group__vars.html#gga133a18">vars.h</a><li>STP_PARAMETER_DEFAULTED
-: <a class="el" href="group__vars.html#gga135a31">vars.h</a><li>STP_PARAMETER_INACTIVE
-: <a class="el" href="group__vars.html#gga135a30">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
-: <a class="el" href="group__vars.html#gga134a22">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
-: <a class="el" href="group__vars.html#gga134a23">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
-: <a class="el" href="group__vars.html#gga134a24">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
-: <a class="el" href="group__vars.html#gga134a25">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
-: <a class="el" href="group__vars.html#gga134a26">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
-: <a class="el" href="group__vars.html#gga134a21">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
-: <a class="el" href="group__vars.html#gga134a28">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
-: <a class="el" href="group__vars.html#gga134a27">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
-: <a class="el" href="group__vars.html#gga134a29">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
-: <a class="el" href="group__vars.html#gga132a14">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
-: <a class="el" href="group__vars.html#gga132a9">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
-: <a class="el" href="group__vars.html#gga132a11">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
-: <a class="el" href="group__vars.html#gga132a15">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
-: <a class="el" href="group__vars.html#gga132a10">vars.h</a><li>STP_PARAMETER_TYPE_FILE
-: <a class="el" href="group__vars.html#gga132a12">vars.h</a><li>STP_PARAMETER_TYPE_INT
-: <a class="el" href="group__vars.html#gga132a8">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
-: <a class="el" href="group__vars.html#gga132a16">vars.h</a><li>STP_PARAMETER_TYPE_RAW
-: <a class="el" href="group__vars.html#gga132a13">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
-: <a class="el" href="group__vars.html#gga132a7">vars.h</a><li>STP_WEAVE_ASCENDING
-: <a class="el" href="weave_8h.html#a26a12">weave.h</a><li>STP_WEAVE_ASCENDING_2X
-: <a class="el" href="weave_8h.html#a26a14">weave.h</a><li>STP_WEAVE_ASCENDING_3X
-: <a class="el" href="weave_8h.html#a26a16">weave.h</a><li>STP_WEAVE_DESCENDING
-: <a class="el" href="weave_8h.html#a26a13">weave.h</a><li>STP_WEAVE_STAGGERED
-: <a class="el" href="weave_8h.html#a26a15">weave.h</a><li>STP_WEAVE_ZIGZAG
-: <a class="el" href="weave_8h.html#a26a11">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41">curve.h</a><li>STP_CURVE_BOUNDS_ERROR
+: <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a">curve.h</a><li>STP_CURVE_BOUNDS_RESCALE
+: <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09">curve.h</a><li>STP_CURVE_COMPOSE_ADD
+: <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d">curve.h</a><li>STP_CURVE_COMPOSE_EXPONENTIATE
+: <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701">curve.h</a><li>STP_CURVE_COMPOSE_MULTIPLY
+: <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011">curve.h</a><li>STP_CURVE_TYPE_LINEAR
+: <a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff">curve.h</a><li>STP_CURVE_TYPE_SPLINE
+: <a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4">curve.h</a><li>STP_CURVE_WRAP_AROUND
+: <a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2">curve.h</a><li>STP_CURVE_WRAP_NONE
+: <a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85">curve.h</a><li>STP_IMAGE_STATUS_ABORT
+: <a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b">image.h</a><li>STP_IMAGE_STATUS_OK
+: <a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5">image.h</a><li>STP_MODULE_CLASS_COLOR
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0">module.h</a><li>STP_MODULE_CLASS_DITHER
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c">module.h</a><li>STP_MODULE_CLASS_FAMILY
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6">module.h</a><li>STP_MODULE_CLASS_INVALID
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452">module.h</a><li>STP_MODULE_CLASS_MISC
+: <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01">module.h</a><li>STP_MXML_ELEMENT
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0">mxml.h</a><li>STP_MXML_INTEGER
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092">mxml.h</a><li>STP_MXML_OPAQUE
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d">mxml.h</a><li>STP_MXML_REAL
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d">mxml.h</a><li>STP_MXML_TEXT
+: <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6">mxml.h</a><li>STP_PARAMETER_ACTIVE
+: <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99">vars.h</a><li>STP_PARAMETER_CLASS_CORE
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9">vars.h</a><li>STP_PARAMETER_CLASS_FEATURE
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11">vars.h</a><li>STP_PARAMETER_CLASS_INVALID
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606">vars.h</a><li>STP_PARAMETER_CLASS_OUTPUT
+: <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a">vars.h</a><li>STP_PARAMETER_DEFAULTED
+: <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136">vars.h</a><li>STP_PARAMETER_INACTIVE
+: <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED1
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED2
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED3
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c">vars.h</a><li>STP_PARAMETER_LEVEL_ADVANCED4
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff">vars.h</a><li>STP_PARAMETER_LEVEL_BASIC
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca">vars.h</a><li>STP_PARAMETER_LEVEL_EXTERNAL
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203">vars.h</a><li>STP_PARAMETER_LEVEL_INTERNAL
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd">vars.h</a><li>STP_PARAMETER_LEVEL_INVALID
+: <a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3">vars.h</a><li>STP_PARAMETER_TYPE_ARRAY
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d">vars.h</a><li>STP_PARAMETER_TYPE_BOOLEAN
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d">vars.h</a><li>STP_PARAMETER_TYPE_CURVE
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e">vars.h</a><li>STP_PARAMETER_TYPE_DIMENSION
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7">vars.h</a><li>STP_PARAMETER_TYPE_DOUBLE
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81">vars.h</a><li>STP_PARAMETER_TYPE_FILE
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6">vars.h</a><li>STP_PARAMETER_TYPE_INT
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4">vars.h</a><li>STP_PARAMETER_TYPE_INVALID
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576">vars.h</a><li>STP_PARAMETER_TYPE_RAW
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372">vars.h</a><li>STP_PARAMETER_TYPE_STRING_LIST
+: <a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2">vars.h</a><li>STP_WEAVE_ASCENDING
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d">weave.h</a><li>STP_WEAVE_ASCENDING_2X
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12">weave.h</a><li>STP_WEAVE_ASCENDING_3X
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b">weave.h</a><li>STP_WEAVE_DESCENDING
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f">weave.h</a><li>STP_WEAVE_STAGGERED
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501">weave.h</a><li>STP_WEAVE_ZIGZAG
+: <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc">weave.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_func.html b/doc/gutenprint/html/globals_func.html
index 87d309a..33a6aee 100644
--- a/doc/gutenprint/html/globals_func.html
+++ b/doc/gutenprint/html/globals_func.html
@@ -2,475 +2,503 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindexHL" href="globals_func.html#index_s">s</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li id="current"><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals_func.html#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_abort()
-: <a class="el" href="group__util.html#ga3">util.h</a><li>stp_allocate_component_data()
-: <a class="el" href="group__vars.html#ga124">vars.h</a><li>stp_array_copy()
-: <a class="el" href="group__array.html#ga3">array.h</a><li>stp_array_create()
-: <a class="el" href="group__array.html#ga1">array.h</a><li>stp_array_create_copy()
-: <a class="el" href="group__array.html#ga4">array.h</a><li>stp_array_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a19">xml.h</a><li>stp_array_destroy()
-: <a class="el" href="group__array.html#ga2">array.h</a><li>stp_array_get_data()
-: <a class="el" href="group__array.html#ga8">array.h</a><li>stp_array_get_point()
-: <a class="el" href="group__array.html#ga10">array.h</a><li>stp_array_get_sequence()
-: <a class="el" href="group__array.html#ga11">array.h</a><li>stp_array_get_size()
-: <a class="el" href="group__array.html#ga6">array.h</a><li>stp_array_set_data()
-: <a class="el" href="group__array.html#ga7">array.h</a><li>stp_array_set_point()
-: <a class="el" href="group__array.html#ga9">array.h</a><li>stp_array_set_size()
-: <a class="el" href="group__array.html#ga5">array.h</a><li>stp_asprintf()
-: <a class="el" href="group__util.html#ga17">util.h</a><li>stp_catprintf()
-: <a class="el" href="group__util.html#ga18">util.h</a><li>stp_channel_add()
-: <a class="el" href="channel_8h.html#a2">channel.h</a><li>stp_channel_convert()
-: <a class="el" href="channel_8h.html#a21">channel.h</a><li>stp_channel_get_black_channel()
-: <a class="el" href="channel_8h.html#a11">channel.h</a><li>stp_channel_get_curve()
-: <a class="el" href="channel_8h.html#a17">channel.h</a><li>stp_channel_get_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a9">channel.h</a><li>stp_channel_get_density_adjustment()
-: <a class="el" href="channel_8h.html#a5">channel.h</a><li>stp_channel_get_gcr_curve()
-: <a class="el" href="channel_8h.html#a19">channel.h</a><li>stp_channel_get_gloss_channel()
-: <a class="el" href="channel_8h.html#a13">channel.h</a><li>stp_channel_get_gloss_limit()
-: <a class="el" href="channel_8h.html#a15">channel.h</a><li>stp_channel_get_ink_limit()
-: <a class="el" href="channel_8h.html#a7">channel.h</a><li>stp_channel_get_input()
-: <a class="el" href="channel_8h.html#a22">channel.h</a><li>stp_channel_get_output()
-: <a class="el" href="channel_8h.html#a23">channel.h</a><li>stp_channel_get_value()
-: <a class="el" href="channel_8h.html#a3">channel.h</a><li>stp_channel_initialize()
-: <a class="el" href="channel_8h.html#a20">channel.h</a><li>stp_channel_reset()
-: <a class="el" href="channel_8h.html#a0">channel.h</a><li>stp_channel_reset_channel()
-: <a class="el" href="channel_8h.html#a1">channel.h</a><li>stp_channel_set_black_channel()
-: <a class="el" href="channel_8h.html#a10">channel.h</a><li>stp_channel_set_curve()
-: <a class="el" href="channel_8h.html#a16">channel.h</a><li>stp_channel_set_cutoff_adjustment()
-: <a class="el" href="channel_8h.html#a8">channel.h</a><li>stp_channel_set_density_adjustment()
-: <a class="el" href="channel_8h.html#a4">channel.h</a><li>stp_channel_set_gcr_curve()
-: <a class="el" href="channel_8h.html#a18">channel.h</a><li>stp_channel_set_gloss_channel()
-: <a class="el" href="channel_8h.html#a12">channel.h</a><li>stp_channel_set_gloss_limit()
-: <a class="el" href="channel_8h.html#a14">channel.h</a><li>stp_channel_set_ink_limit()
-: <a class="el" href="channel_8h.html#a6">channel.h</a><li>stp_check_array_parameter()
-: <a class="el" href="group__vars.html#ga107">vars.h</a><li>stp_check_boolean_parameter()
-: <a class="el" href="group__vars.html#ga105">vars.h</a><li>stp_check_curve_parameter()
-: <a class="el" href="group__vars.html#ga106">vars.h</a><li>stp_check_dimension_parameter()
-: <a class="el" href="group__vars.html#ga104">vars.h</a><li>stp_check_file_parameter()
-: <a class="el" href="group__vars.html#ga101">vars.h</a><li>stp_check_float_parameter()
-: <a class="el" href="group__vars.html#ga102">vars.h</a><li>stp_check_int_parameter()
-: <a class="el" href="group__vars.html#ga103">vars.h</a><li>stp_check_raw_parameter()
-: <a class="el" href="group__vars.html#ga108">vars.h</a><li>stp_check_string_parameter()
-: <a class="el" href="group__vars.html#ga100">vars.h</a><li>stp_check_version()
-: <a class="el" href="group__version.html#ga6">gutenprint-version.h</a><li>stp_clear_array_parameter()
-: <a class="el" href="group__vars.html#ga89">vars.h</a><li>stp_clear_boolean_parameter()
-: <a class="el" href="group__vars.html#ga87">vars.h</a><li>stp_clear_curve_parameter()
-: <a class="el" href="group__vars.html#ga88">vars.h</a><li>stp_clear_dimension_parameter()
-: <a class="el" href="group__vars.html#ga86">vars.h</a><li>stp_clear_file_parameter()
-: <a class="el" href="group__vars.html#ga83">vars.h</a><li>stp_clear_float_parameter()
-: <a class="el" href="group__vars.html#ga84">vars.h</a><li>stp_clear_int_parameter()
-: <a class="el" href="group__vars.html#ga85">vars.h</a><li>stp_clear_raw_parameter()
-: <a class="el" href="group__vars.html#ga90">vars.h</a><li>stp_clear_string_parameter()
-: <a class="el" href="group__vars.html#ga82">vars.h</a><li>stp_color_count()
-: <a class="el" href="group__color.html#ga12">color.h</a><li>stp_color_describe_parameter()
-: <a class="el" href="group__color.html#ga9">color.h</a><li>stp_color_get_long_name()
-: <a class="el" href="group__color.html#ga17">color.h</a><li>stp_color_get_name()
-: <a class="el" href="group__color.html#ga16">color.h</a><li>stp_color_get_row()
-: <a class="el" href="group__color.html#ga7">color.h</a><li>stp_color_init()
-: <a class="el" href="group__color.html#ga6">color.h</a><li>stp_color_list_parameters()
-: <a class="el" href="group__color.html#ga8">color.h</a><li>stp_color_register()
-: <a class="el" href="group__color.html#ga10">color.h</a><li>stp_color_unregister()
-: <a class="el" href="group__color.html#ga11">color.h</a><li>stp_copy_options()
-: <a class="el" href="group__vars.html#ga130">vars.h</a><li>stp_curve_cache_copy()
-: <a class="el" href="curve-cache_8h.html#a12">curve-cache.h</a><li>stp_curve_cache_curve_data()
-: <a class="el" href="curve-cache_8h.html#a4">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
-: <a class="el" href="curve-cache_8h.html#a6">curve-cache.h</a><li>stp_curve_cache_get_count()
-: <a class="el" href="curve-cache_8h.html#a9">curve-cache.h</a><li>stp_curve_cache_get_curve()
-: <a class="el" href="curve-cache_8h.html#a5">curve-cache.h</a><li>stp_curve_cache_get_double_data()
-: <a class="el" href="curve-cache_8h.html#a11">curve-cache.h</a><li>stp_curve_cache_get_ushort_data()
-: <a class="el" href="curve-cache_8h.html#a10">curve-cache.h</a><li>stp_curve_cache_set_curve()
-: <a class="el" href="curve-cache_8h.html#a7">curve-cache.h</a><li>stp_curve_cache_set_curve_copy()
-: <a class="el" href="curve-cache_8h.html#a8">curve-cache.h</a><li>stp_curve_compose()
-: <a class="el" href="group__curve.html#ga46">curve.h</a><li>stp_curve_copy()
-: <a class="el" href="group__curve.html#ga3">curve.h</a><li>stp_curve_count_points()
-: <a class="el" href="group__curve.html#ga10">curve.h</a><li>stp_curve_create()
-: <a class="el" href="group__curve.html#ga1">curve.h</a><li>stp_curve_create_copy()
-: <a class="el" href="group__curve.html#ga2">curve.h</a><li>stp_curve_create_from_file()
-: <a class="el" href="group__curve.html#ga44">curve.h</a><li>stp_curve_create_from_stream()
-: <a class="el" href="group__curve.html#ga43">curve.h</a><li>stp_curve_create_from_string()
-: <a class="el" href="group__curve.html#ga45">curve.h</a><li>stp_curve_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a17">xml.h</a><li>stp_curve_destroy()
-: <a class="el" href="group__curve.html#ga4">curve.h</a><li>stp_curve_free_curve_cache()
-: <a class="el" href="curve-cache_8h.html#a3">curve-cache.h</a><li>stp_curve_get_bounds()
-: <a class="el" href="group__curve.html#ga6">curve.h</a><li>stp_curve_get_data()
-: <a class="el" href="group__curve.html#ga24">curve.h</a><li>stp_curve_get_data_points()
-: <a class="el" href="group__curve.html#ga25">curve.h</a><li>stp_curve_get_float_data()
-: <a class="el" href="group__curve.html#ga26">curve.h</a><li>stp_curve_get_gamma()
-: <a class="el" href="group__curve.html#ga35">curve.h</a><li>stp_curve_get_int_data()
-: <a class="el" href="group__curve.html#ga29">curve.h</a><li>stp_curve_get_interpolation_type()
-: <a class="el" href="group__curve.html#ga12">curve.h</a><li>stp_curve_get_long_data()
-: <a class="el" href="group__curve.html#ga27">curve.h</a><li>stp_curve_get_point()
-: <a class="el" href="group__curve.html#ga37">curve.h</a><li>stp_curve_get_range()
-: <a class="el" href="group__curve.html#ga9">curve.h</a><li>stp_curve_get_sequence()
-: <a class="el" href="group__curve.html#ga33">curve.h</a><li>stp_curve_get_short_data()
-: <a class="el" href="group__curve.html#ga31">curve.h</a><li>stp_curve_get_subrange()
-: <a class="el" href="group__curve.html#ga22">curve.h</a><li>stp_curve_get_uint_data()
-: <a class="el" href="group__curve.html#ga30">curve.h</a><li>stp_curve_get_ulong_data()
-: <a class="el" href="group__curve.html#ga28">curve.h</a><li>stp_curve_get_ushort_data()
-: <a class="el" href="group__curve.html#ga32">curve.h</a><li>stp_curve_get_wrap()
-: <a class="el" href="group__curve.html#ga7">curve.h</a><li>stp_curve_interpolate_value()
-: <a class="el" href="group__curve.html#ga38">curve.h</a><li>stp_curve_is_piecewise()
-: <a class="el" href="group__curve.html#ga8">curve.h</a><li>stp_curve_resample()
-: <a class="el" href="group__curve.html#ga39">curve.h</a><li>stp_curve_rescale()
-: <a class="el" href="group__curve.html#ga40">curve.h</a><li>stp_curve_set_bounds()
-: <a class="el" href="group__curve.html#ga5">curve.h</a><li>stp_curve_set_data()
-: <a class="el" href="group__curve.html#ga13">curve.h</a><li>stp_curve_set_data_points()
-: <a class="el" href="group__curve.html#ga14">curve.h</a><li>stp_curve_set_float_data()
-: <a class="el" href="group__curve.html#ga15">curve.h</a><li>stp_curve_set_gamma()
-: <a class="el" href="group__curve.html#ga34">curve.h</a><li>stp_curve_set_int_data()
-: <a class="el" href="group__curve.html#ga18">curve.h</a><li>stp_curve_set_interpolation_type()
-: <a class="el" href="group__curve.html#ga11">curve.h</a><li>stp_curve_set_long_data()
-: <a class="el" href="group__curve.html#ga16">curve.h</a><li>stp_curve_set_point()
-: <a class="el" href="group__curve.html#ga36">curve.h</a><li>stp_curve_set_short_data()
-: <a class="el" href="group__curve.html#ga20">curve.h</a><li>stp_curve_set_subrange()
-: <a class="el" href="group__curve.html#ga23">curve.h</a><li>stp_curve_set_uint_data()
-: <a class="el" href="group__curve.html#ga19">curve.h</a><li>stp_curve_set_ulong_data()
-: <a class="el" href="group__curve.html#ga17">curve.h</a><li>stp_curve_set_ushort_data()
-: <a class="el" href="group__curve.html#ga21">curve.h</a><li>stp_curve_write()
-: <a class="el" href="group__curve.html#ga41">curve.h</a><li>stp_curve_write_string()
-: <a class="el" href="group__curve.html#ga42">curve.h</a><li>stp_default_media_size()
-: <a class="el" href="group__papersize.html#ga4">paper.h</a><li>stp_default_settings()
-: <a class="el" href="group__vars.html#ga123">vars.h</a><li>stp_deprintf()
-: <a class="el" href="group__util.html#ga21">util.h</a><li>stp_describe_output()
-: <a class="el" href="group__printer.html#ga25">printers.h</a><li>stp_describe_parameter()
-: <a class="el" href="group__vars.html#ga47">vars.h</a><li>stp_describe_resolution()
-: <a class="el" href="group__vars.html#ga121">vars.h</a><li>stp_destroy_component_data()
-: <a class="el" href="group__vars.html#ga125">vars.h</a><li>stp_dither()
-: <a class="el" href="dither_8h.html#a40">dither.h</a><li>stp_dither_add_channel()
-: <a class="el" href="dither_8h.html#a38">dither.h</a><li>stp_dither_describe_parameter()
-: <a class="el" href="dither_8h.html#a24">dither.h</a><li>stp_dither_get_channel()
-: <a class="el" href="dither_8h.html#a39">dither.h</a><li>stp_dither_get_first_position()
-: <a class="el" href="dither_8h.html#a33">dither.h</a><li>stp_dither_get_last_position()
-: <a class="el" href="dither_8h.html#a34">dither.h</a><li>stp_dither_init()
-: <a class="el" href="dither_8h.html#a25">dither.h</a><li>stp_dither_internal()
-: <a class="el" href="dither_8h.html#a41">dither.h</a><li>stp_dither_list_parameters()
-: <a class="el" href="dither_8h.html#a23">dither.h</a><li>stp_dither_matrix_clone()
-: <a class="el" href="dither_8h.html#a18">dither.h</a><li>stp_dither_matrix_copy()
-: <a class="el" href="dither_8h.html#a19">dither.h</a><li>stp_dither_matrix_destroy()
-: <a class="el" href="dither_8h.html#a17">dither.h</a><li>stp_dither_matrix_init()
-: <a class="el" href="dither_8h.html#a13">dither.h</a><li>stp_dither_matrix_init_from_dither_array()
-: <a class="el" href="dither_8h.html#a16">dither.h</a><li>stp_dither_matrix_init_short()
-: <a class="el" href="dither_8h.html#a14">dither.h</a><li>stp_dither_matrix_iterated_init()
-: <a class="el" href="dither_8h.html#a11">dither.h</a><li>stp_dither_matrix_scale_exponentially()
-: <a class="el" href="dither_8h.html#a20">dither.h</a><li>stp_dither_matrix_set_row()
-: <a class="el" href="dither_8h.html#a21">dither.h</a><li>stp_dither_matrix_shear()
-: <a class="el" href="dither_8h.html#a12">dither.h</a><li>stp_dither_matrix_validate_array()
-: <a class="el" href="dither_8h.html#a15">dither.h</a><li>stp_dither_set_adaptive_limit()
-: <a class="el" href="dither_8h.html#a32">dither.h</a><li>stp_dither_set_ink_spread()
-: <a class="el" href="dither_8h.html#a31">dither.h</a><li>stp_dither_set_inks()
-: <a class="el" href="dither_8h.html#a37">dither.h</a><li>stp_dither_set_inks_full()
-: <a class="el" href="dither_8h.html#a36">dither.h</a><li>stp_dither_set_inks_simple()
-: <a class="el" href="dither_8h.html#a35">dither.h</a><li>stp_dither_set_iterated_matrix()
-: <a class="el" href="dither_8h.html#a26">dither.h</a><li>stp_dither_set_matrix()
-: <a class="el" href="dither_8h.html#a27">dither.h</a><li>stp_dither_set_matrix_from_dither_array()
-: <a class="el" href="dither_8h.html#a28">dither.h</a><li>stp_dither_set_randomizer()
-: <a class="el" href="dither_8h.html#a30">dither.h</a><li>stp_dither_set_transition()
-: <a class="el" href="dither_8h.html#a29">dither.h</a><li>stp_dprintf()
-: <a class="el" href="group__util.html#ga20">util.h</a><li>stp_end_job()
-: <a class="el" href="group__printer.html#ga17">printers.h</a><li>stp_eprintf()
-: <a class="el" href="group__util.html#ga15">util.h</a><li>stp_erprintf()
-: <a class="el" href="group__util.html#ga16">util.h</a><li>stp_erputc()
-: <a class="el" href="group__util.html#ga14">util.h</a><li>stp_family_register()
-: <a class="el" href="group__printer.html#ga20">printers.h</a><li>stp_family_unregister()
-: <a class="el" href="group__printer.html#ga21">printers.h</a><li>stp_fill_parameter_settings()
-: <a class="el" href="group__vars.html#ga131">vars.h</a><li>stp_find_standard_dither_array()
-: <a class="el" href="dither_8h.html#a22">dither.h</a><li>stp_flush_all()
-: <a class="el" href="weave_8h.html#a18">weave.h</a><li>stp_flush_debug_messages()
-: <a class="el" href="group__util.html#ga23">util.h</a><li>stp_fold()
-: <a class="el" href="bit-ops_8h.html#a0">bit-ops.h</a><li>stp_free()
-: <a class="el" href="group__util.html#ga27">util.h</a><li>stp_get_array_parameter()
-: <a class="el" href="group__vars.html#ga80">vars.h</a><li>stp_get_array_parameter_active()
-: <a class="el" href="group__vars.html#ga116">vars.h</a><li>stp_get_boolean_parameter()
-: <a class="el" href="group__vars.html#ga78">vars.h</a><li>stp_get_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga114">vars.h</a><li>stp_get_color_by_colorfuncs()
-: <a class="el" href="group__color.html#ga15">color.h</a><li>stp_get_color_by_index()
-: <a class="el" href="group__color.html#ga14">color.h</a><li>stp_get_color_by_name()
-: <a class="el" href="group__color.html#ga13">color.h</a><li>stp_get_color_conversion()
-: <a class="el" href="group__vars.html#ga16">vars.h</a><li>stp_get_component_data()
-: <a class="el" href="group__vars.html#ga126">vars.h</a><li>stp_get_curve_parameter()
-: <a class="el" href="group__vars.html#ga79">vars.h</a><li>stp_get_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga115">vars.h</a><li>stp_get_debug_level()
-: <a class="el" href="group__util.html#ga19">util.h</a><li>stp_get_dimension_parameter()
-: <a class="el" href="group__vars.html#ga77">vars.h</a><li>stp_get_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga113">vars.h</a><li>stp_get_driver()
-: <a class="el" href="group__vars.html#ga13">vars.h</a><li>stp_get_errdata()
-: <a class="el" href="group__vars.html#ga36">vars.h</a><li>stp_get_errfunc()
-: <a class="el" href="group__vars.html#ga32">vars.h</a><li>stp_get_file_parameter()
-: <a class="el" href="group__vars.html#ga74">vars.h</a><li>stp_get_file_parameter_active()
-: <a class="el" href="group__vars.html#ga110">vars.h</a><li>stp_get_float_parameter()
-: <a class="el" href="group__vars.html#ga75">vars.h</a><li>stp_get_float_parameter_active()
-: <a class="el" href="group__vars.html#ga111">vars.h</a><li>stp_get_height()
-: <a class="el" href="group__vars.html#ga24">vars.h</a><li>stp_get_imageable_area()
-: <a class="el" href="group__vars.html#ga119">vars.h</a><li>stp_get_int_parameter()
-: <a class="el" href="group__vars.html#ga76">vars.h</a><li>stp_get_int_parameter_active()
-: <a class="el" href="group__vars.html#ga112">vars.h</a><li>stp_get_left()
-: <a class="el" href="group__vars.html#ga18">vars.h</a><li>stp_get_lineactive_by_pass()
-: <a class="el" href="weave_8h.html#a21">weave.h</a><li>stp_get_linebases_by_pass()
-: <a class="el" href="weave_8h.html#a23">weave.h</a><li>stp_get_linecount_by_pass()
-: <a class="el" href="weave_8h.html#a22">weave.h</a><li>stp_get_lineoffsets_by_pass()
-: <a class="el" href="weave_8h.html#a20">weave.h</a><li>stp_get_media_size()
-: <a class="el" href="group__vars.html#ga118">vars.h</a><li>stp_get_model_id()
-: <a class="el" href="group__printer.html#ga18">printers.h</a><li>stp_get_outdata()
-: <a class="el" href="group__vars.html#ga34">vars.h</a><li>stp_get_outfunc()
-: <a class="el" href="group__vars.html#ga30">vars.h</a><li>stp_get_page_height()
-: <a class="el" href="group__vars.html#ga28">vars.h</a><li>stp_get_page_width()
-: <a class="el" href="group__vars.html#ga26">vars.h</a><li>stp_get_papersize_by_index()
-: <a class="el" href="group__papersize.html#ga3">paper.h</a><li>stp_get_papersize_by_name()
-: <a class="el" href="group__papersize.html#ga1">paper.h</a><li>stp_get_papersize_by_size()
-: <a class="el" href="group__papersize.html#ga2">paper.h</a><li>stp_get_parameter_list()
-: <a class="el" href="group__vars.html#ga38">vars.h</a><li>stp_get_pass_by_pass()
-: <a class="el" href="weave_8h.html#a24">weave.h</a><li>stp_get_printer()
-: <a class="el" href="group__printer.html#ga6">printers.h</a><li>stp_get_printer_by_driver()
-: <a class="el" href="group__printer.html#ga5">printers.h</a><li>stp_get_printer_by_index()
-: <a class="el" href="group__printer.html#ga3">printers.h</a><li>stp_get_printer_by_long_name()
-: <a class="el" href="group__printer.html#ga4">printers.h</a><li>stp_get_printer_index_by_driver()
-: <a class="el" href="group__printer.html#ga7">printers.h</a><li>stp_get_raw_parameter()
-: <a class="el" href="group__vars.html#ga81">vars.h</a><li>stp_get_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga117">vars.h</a><li>stp_get_release_version()
-: <a class="el" href="group__util.html#ga32">util.h</a><li>stp_get_size_limit()
-: <a class="el" href="group__vars.html#ga120">vars.h</a><li>stp_get_string_parameter()
-: <a class="el" href="group__vars.html#ga73">vars.h</a><li>stp_get_string_parameter_active()
-: <a class="el" href="group__vars.html#ga109">vars.h</a><li>stp_get_top()
-: <a class="el" href="group__vars.html#ga20">vars.h</a><li>stp_get_verified()
-: <a class="el" href="group__vars.html#ga128">vars.h</a><li>stp_get_version()
-: <a class="el" href="group__util.html#ga31">util.h</a><li>stp_get_width()
-: <a class="el" href="group__vars.html#ga22">vars.h</a><li>stp_image_conclude()
-: <a class="el" href="group__image.html#ga15">image.h</a><li>stp_image_get_appname()
-: <a class="el" href="group__image.html#ga14">image.h</a><li>stp_image_get_row()
-: <a class="el" href="group__image.html#ga13">image.h</a><li>stp_image_height()
-: <a class="el" href="group__image.html#ga12">image.h</a><li>stp_image_init()
-: <a class="el" href="group__image.html#ga9">image.h</a><li>stp_image_reset()
-: <a class="el" href="group__image.html#ga10">image.h</a><li>stp_image_width()
-: <a class="el" href="group__image.html#ga11">image.h</a><li>stp_init()
-: <a class="el" href="group__util.html#ga0">util.h</a><li>stp_init_debug_messages()
-: <a class="el" href="group__util.html#ga22">util.h</a><li>stp_initialize_printer_defaults()
-: <a class="el" href="group__printer.html#ga22">printers.h</a><li>stp_initialize_weave()
-: <a class="el" href="weave_8h.html#a17">weave.h</a><li>stp_known_papersizes()
-: <a class="el" href="group__papersize.html#ga0">paper.h</a><li>stp_list_copy()
-: <a class="el" href="group__list.html#ga8">list.h</a><li>stp_list_create()
-: <a class="el" href="group__list.html#ga7">list.h</a><li>stp_list_destroy()
-: <a class="el" href="group__list.html#ga9">list.h</a><li>stp_list_get_copyfunc()
-: <a class="el" href="group__list.html#ga19">list.h</a><li>stp_list_get_end()
-: <a class="el" href="group__list.html#ga11">list.h</a><li>stp_list_get_freefunc()
-: <a class="el" href="group__list.html#ga17">list.h</a><li>stp_list_get_item_by_index()
-: <a class="el" href="group__list.html#ga12">list.h</a><li>stp_list_get_item_by_long_name()
-: <a class="el" href="group__list.html#ga14">list.h</a><li>stp_list_get_item_by_name()
-: <a class="el" href="group__list.html#ga13">list.h</a><li>stp_list_get_length()
-: <a class="el" href="group__list.html#ga15">list.h</a><li>stp_list_get_long_namefunc()
-: <a class="el" href="group__list.html#ga23">list.h</a><li>stp_list_get_namefunc()
-: <a class="el" href="group__list.html#ga21">list.h</a><li>stp_list_get_sortfunc()
-: <a class="el" href="group__list.html#ga25">list.h</a><li>stp_list_get_start()
-: <a class="el" href="group__list.html#ga10">list.h</a><li>stp_list_item_create()
-: <a class="el" href="group__list.html#ga26">list.h</a><li>stp_list_item_destroy()
-: <a class="el" href="group__list.html#ga27">list.h</a><li>stp_list_item_get_data()
-: <a class="el" href="group__list.html#ga30">list.h</a><li>stp_list_item_next()
-: <a class="el" href="group__list.html#ga29">list.h</a><li>stp_list_item_prev()
-: <a class="el" href="group__list.html#ga28">list.h</a><li>stp_list_item_set_data()
-: <a class="el" href="group__list.html#ga31">list.h</a><li>stp_list_node_free_data()
-: <a class="el" href="group__list.html#ga6">list.h</a><li>stp_list_set_copyfunc()
-: <a class="el" href="group__list.html#ga18">list.h</a><li>stp_list_set_freefunc()
-: <a class="el" href="group__list.html#ga16">list.h</a><li>stp_list_set_long_namefunc()
-: <a class="el" href="group__list.html#ga22">list.h</a><li>stp_list_set_namefunc()
-: <a class="el" href="group__list.html#ga20">list.h</a><li>stp_list_set_sortfunc()
-: <a class="el" href="group__list.html#ga24">list.h</a><li>stp_malloc()
-: <a class="el" href="group__util.html#ga24">util.h</a><li>stp_merge_printvars()
-: <a class="el" href="group__vars.html#ga37">vars.h</a><li>stp_module_close()
-: <a class="el" href="module_8h.html#a11">module.h</a><li>stp_module_exit()
-: <a class="el" href="module_8h.html#a8">module.h</a><li>stp_module_get_class()
-: <a class="el" href="module_8h.html#a12">module.h</a><li>stp_module_init()
-: <a class="el" href="module_8h.html#a10">module.h</a><li>stp_module_load()
-: <a class="el" href="module_8h.html#a7">module.h</a><li>stp_module_open()
-: <a class="el" href="module_8h.html#a9">module.h</a><li>stp_mxmlAdd()
-: <a class="el" href="mxml_8h.html#a25">mxml.h</a><li>stp_mxmlDelete()
-: <a class="el" href="mxml_8h.html#a26">mxml.h</a><li>stp_mxmlElementGetAttr()
-: <a class="el" href="mxml_8h.html#a27">mxml.h</a><li>stp_mxmlElementSetAttr()
-: <a class="el" href="mxml_8h.html#a28">mxml.h</a><li>stp_mxmlFindElement()
-: <a class="el" href="mxml_8h.html#a29">mxml.h</a><li>stp_mxmlLoadFile()
-: <a class="el" href="mxml_8h.html#a30">mxml.h</a><li>stp_mxmlLoadString()
-: <a class="el" href="mxml_8h.html#a31">mxml.h</a><li>stp_mxmlNewElement()
-: <a class="el" href="mxml_8h.html#a32">mxml.h</a><li>stp_mxmlNewInteger()
-: <a class="el" href="mxml_8h.html#a33">mxml.h</a><li>stp_mxmlNewOpaque()
-: <a class="el" href="mxml_8h.html#a34">mxml.h</a><li>stp_mxmlNewReal()
-: <a class="el" href="mxml_8h.html#a35">mxml.h</a><li>stp_mxmlNewText()
-: <a class="el" href="mxml_8h.html#a36">mxml.h</a><li>stp_mxmlRemove()
-: <a class="el" href="mxml_8h.html#a37">mxml.h</a><li>stp_mxmlSaveAllocString()
-: <a class="el" href="mxml_8h.html#a38">mxml.h</a><li>stp_mxmlSaveFile()
-: <a class="el" href="mxml_8h.html#a39">mxml.h</a><li>stp_mxmlSaveString()
-: <a class="el" href="mxml_8h.html#a40">mxml.h</a><li>stp_mxmlWalkNext()
-: <a class="el" href="mxml_8h.html#a41">mxml.h</a><li>stp_mxmlWalkPrev()
-: <a class="el" href="mxml_8h.html#a42">mxml.h</a><li>stp_parameter_description_destroy()
-: <a class="el" href="group__vars.html#ga48">vars.h</a><li>stp_parameter_find()
-: <a class="el" href="group__vars.html#ga40">vars.h</a><li>stp_parameter_find_in_settings()
-: <a class="el" href="group__vars.html#ga49">vars.h</a><li>stp_parameter_list_add_param()
-: <a class="el" href="group__vars.html#ga44">vars.h</a><li>stp_parameter_list_append()
-: <a class="el" href="group__vars.html#ga46">vars.h</a><li>stp_parameter_list_copy()
-: <a class="el" href="group__vars.html#ga45">vars.h</a><li>stp_parameter_list_count()
-: <a class="el" href="group__vars.html#ga39">vars.h</a><li>stp_parameter_list_create()
-: <a class="el" href="group__vars.html#ga43">vars.h</a><li>stp_parameter_list_destroy()
-: <a class="el" href="group__vars.html#ga42">vars.h</a><li>stp_parameter_list_param()
-: <a class="el" href="group__vars.html#ga41">vars.h</a><li>stp_path_search()
-: <a class="el" href="path_8h.html#a0">path.h</a><li>stp_path_split()
-: <a class="el" href="path_8h.html#a1">path.h</a><li>stp_print()
-: <a class="el" href="group__printer.html#ga15">printers.h</a><li>stp_printer_describe_parameter()
-: <a class="el" href="group__printer.html#ga24">printers.h</a><li>stp_printer_get_defaults()
-: <a class="el" href="group__printer.html#ga13">printers.h</a><li>stp_printer_get_driver()
-: <a class="el" href="group__printer.html#ga9">printers.h</a><li>stp_printer_get_family()
-: <a class="el" href="group__printer.html#ga10">printers.h</a><li>stp_printer_get_long_name()
-: <a class="el" href="group__printer.html#ga8">printers.h</a><li>stp_printer_get_manufacturer()
-: <a class="el" href="group__printer.html#ga11">printers.h</a><li>stp_printer_get_model()
-: <a class="el" href="group__printer.html#ga12">printers.h</a><li>stp_printer_list_parameters()
-: <a class="el" href="group__printer.html#ga23">printers.h</a><li>stp_printer_model_count()
-: <a class="el" href="group__printer.html#ga2">printers.h</a><li>stp_prune_inactive_options()
-: <a class="el" href="group__util.html#ga4">util.h</a><li>stp_put16_be()
-: <a class="el" href="group__util.html#ga9">util.h</a><li>stp_put16_le()
-: <a class="el" href="group__util.html#ga8">util.h</a><li>stp_put32_be()
-: <a class="el" href="group__util.html#ga11">util.h</a><li>stp_put32_le()
-: <a class="el" href="group__util.html#ga10">util.h</a><li>stp_putc()
-: <a class="el" href="group__util.html#ga7">util.h</a><li>stp_puts()
-: <a class="el" href="group__util.html#ga12">util.h</a><li>stp_read_and_compose_curves()
-: <a class="el" href="group__util.html#ga2">util.h</a><li>stp_realloc()
-: <a class="el" href="group__util.html#ga26">util.h</a><li>stp_register_xml_parser()
-: <a class="el" href="xml_8h.html#a1">xml.h</a><li>stp_register_xml_preload()
-: <a class="el" href="xml_8h.html#a3">xml.h</a><li>stp_scale_float_parameter()
-: <a class="el" href="group__vars.html#ga61">vars.h</a><li>stp_send_command()
-: <a class="el" href="group__util.html#ga13">util.h</a><li>stp_sequence_copy()
-: <a class="el" href="group__sequence.html#ga3">sequence.h</a><li>stp_sequence_create()
-: <a class="el" href="group__sequence.html#ga1">sequence.h</a><li>stp_sequence_create_copy()
-: <a class="el" href="group__sequence.html#ga4">sequence.h</a><li>stp_sequence_create_from_xmltree()
-: <a class="el" href="xml_8h.html#a15">xml.h</a><li>stp_sequence_destroy()
-: <a class="el" href="group__sequence.html#ga2">sequence.h</a><li>stp_sequence_get_bounds()
-: <a class="el" href="group__sequence.html#ga6">sequence.h</a><li>stp_sequence_get_data()
-: <a class="el" href="group__sequence.html#ga12">sequence.h</a><li>stp_sequence_get_float_data()
-: <a class="el" href="group__sequence.html#ga22">sequence.h</a><li>stp_sequence_get_int_data()
-: <a class="el" href="group__sequence.html#ga25">sequence.h</a><li>stp_sequence_get_long_data()
-: <a class="el" href="group__sequence.html#ga23">sequence.h</a><li>stp_sequence_get_point()
-: <a class="el" href="group__sequence.html#ga14">sequence.h</a><li>stp_sequence_get_range()
-: <a class="el" href="group__sequence.html#ga7">sequence.h</a><li>stp_sequence_get_short_data()
-: <a class="el" href="group__sequence.html#ga27">sequence.h</a><li>stp_sequence_get_size()
-: <a class="el" href="group__sequence.html#ga9">sequence.h</a><li>stp_sequence_get_uint_data()
-: <a class="el" href="group__sequence.html#ga26">sequence.h</a><li>stp_sequence_get_ulong_data()
-: <a class="el" href="group__sequence.html#ga24">sequence.h</a><li>stp_sequence_get_ushort_data()
-: <a class="el" href="group__sequence.html#ga28">sequence.h</a><li>stp_sequence_set_bounds()
-: <a class="el" href="group__sequence.html#ga5">sequence.h</a><li>stp_sequence_set_data()
-: <a class="el" href="group__sequence.html#ga10">sequence.h</a><li>stp_sequence_set_float_data()
-: <a class="el" href="group__sequence.html#ga15">sequence.h</a><li>stp_sequence_set_int_data()
-: <a class="el" href="group__sequence.html#ga18">sequence.h</a><li>stp_sequence_set_long_data()
-: <a class="el" href="group__sequence.html#ga16">sequence.h</a><li>stp_sequence_set_point()
-: <a class="el" href="group__sequence.html#ga13">sequence.h</a><li>stp_sequence_set_short_data()
-: <a class="el" href="group__sequence.html#ga20">sequence.h</a><li>stp_sequence_set_size()
-: <a class="el" href="group__sequence.html#ga8">sequence.h</a><li>stp_sequence_set_subrange()
-: <a class="el" href="group__sequence.html#ga11">sequence.h</a><li>stp_sequence_set_uint_data()
-: <a class="el" href="group__sequence.html#ga19">sequence.h</a><li>stp_sequence_set_ulong_data()
-: <a class="el" href="group__sequence.html#ga17">sequence.h</a><li>stp_sequence_set_ushort_data()
-: <a class="el" href="group__sequence.html#ga21">sequence.h</a><li>stp_set_array_parameter()
-: <a class="el" href="group__vars.html#ga59">vars.h</a><li>stp_set_array_parameter_active()
-: <a class="el" href="group__vars.html#ga98">vars.h</a><li>stp_set_boolean_parameter()
-: <a class="el" href="group__vars.html#ga57">vars.h</a><li>stp_set_boolean_parameter_active()
-: <a class="el" href="group__vars.html#ga96">vars.h</a><li>stp_set_color_conversion()
-: <a class="el" href="group__vars.html#ga14">vars.h</a><li>stp_set_color_conversion_n()
-: <a class="el" href="group__vars.html#ga15">vars.h</a><li>stp_set_curve_parameter()
-: <a class="el" href="group__vars.html#ga58">vars.h</a><li>stp_set_curve_parameter_active()
-: <a class="el" href="group__vars.html#ga97">vars.h</a><li>stp_set_default_array_parameter()
-: <a class="el" href="group__vars.html#ga71">vars.h</a><li>stp_set_default_boolean_parameter()
-: <a class="el" href="group__vars.html#ga69">vars.h</a><li>stp_set_default_curve_parameter()
-: <a class="el" href="group__vars.html#ga70">vars.h</a><li>stp_set_default_dimension_parameter()
-: <a class="el" href="group__vars.html#ga68">vars.h</a><li>stp_set_default_file_parameter()
-: <a class="el" href="group__vars.html#ga64">vars.h</a><li>stp_set_default_file_parameter_n()
-: <a class="el" href="group__vars.html#ga65">vars.h</a><li>stp_set_default_float_parameter()
-: <a class="el" href="group__vars.html#ga66">vars.h</a><li>stp_set_default_int_parameter()
-: <a class="el" href="group__vars.html#ga67">vars.h</a><li>stp_set_default_raw_parameter()
-: <a class="el" href="group__vars.html#ga72">vars.h</a><li>stp_set_default_string_parameter()
-: <a class="el" href="group__vars.html#ga62">vars.h</a><li>stp_set_default_string_parameter_n()
-: <a class="el" href="group__vars.html#ga63">vars.h</a><li>stp_set_dimension_parameter()
-: <a class="el" href="group__vars.html#ga56">vars.h</a><li>stp_set_dimension_parameter_active()
-: <a class="el" href="group__vars.html#ga95">vars.h</a><li>stp_set_driver()
-: <a class="el" href="group__vars.html#ga11">vars.h</a><li>stp_set_driver_n()
-: <a class="el" href="group__vars.html#ga12">vars.h</a><li>stp_set_errdata()
-: <a class="el" href="group__vars.html#ga35">vars.h</a><li>stp_set_errfunc()
-: <a class="el" href="group__vars.html#ga31">vars.h</a><li>stp_set_file_parameter()
-: <a class="el" href="group__vars.html#ga52">vars.h</a><li>stp_set_file_parameter_active()
-: <a class="el" href="group__vars.html#ga92">vars.h</a><li>stp_set_file_parameter_n()
-: <a class="el" href="group__vars.html#ga53">vars.h</a><li>stp_set_float_parameter()
-: <a class="el" href="group__vars.html#ga54">vars.h</a><li>stp_set_float_parameter_active()
-: <a class="el" href="group__vars.html#ga93">vars.h</a><li>stp_set_height()
-: <a class="el" href="group__vars.html#ga23">vars.h</a><li>stp_set_int_parameter()
-: <a class="el" href="group__vars.html#ga55">vars.h</a><li>stp_set_int_parameter_active()
-: <a class="el" href="group__vars.html#ga94">vars.h</a><li>stp_set_left()
-: <a class="el" href="group__vars.html#ga17">vars.h</a><li>stp_set_outdata()
-: <a class="el" href="group__vars.html#ga33">vars.h</a><li>stp_set_outfunc()
-: <a class="el" href="group__vars.html#ga29">vars.h</a><li>stp_set_output_codeset()
-: <a class="el" href="group__util.html#ga1">util.h</a><li>stp_set_page_height()
-: <a class="el" href="group__vars.html#ga27">vars.h</a><li>stp_set_page_width()
-: <a class="el" href="group__vars.html#ga25">vars.h</a><li>stp_set_printer_defaults()
-: <a class="el" href="group__printer.html#ga14">printers.h</a><li>stp_set_raw_parameter()
-: <a class="el" href="group__vars.html#ga60">vars.h</a><li>stp_set_raw_parameter_active()
-: <a class="el" href="group__vars.html#ga99">vars.h</a><li>stp_set_string_parameter()
-: <a class="el" href="group__vars.html#ga50">vars.h</a><li>stp_set_string_parameter_active()
-: <a class="el" href="group__vars.html#ga91">vars.h</a><li>stp_set_string_parameter_n()
-: <a class="el" href="group__vars.html#ga51">vars.h</a><li>stp_set_top()
-: <a class="el" href="group__vars.html#ga19">vars.h</a><li>stp_set_verified()
-: <a class="el" href="group__vars.html#ga129">vars.h</a><li>stp_set_width()
-: <a class="el" href="group__vars.html#ga21">vars.h</a><li>stp_split_2()
-: <a class="el" href="bit-ops_8h.html#a1">bit-ops.h</a><li>stp_split_4()
-: <a class="el" href="bit-ops_8h.html#a2">bit-ops.h</a><li>stp_start_job()
-: <a class="el" href="group__printer.html#ga16">printers.h</a><li>stp_strdup()
-: <a class="el" href="group__util.html#ga30">util.h</a><li>stp_string_list_add_string()
-: <a class="el" href="string-list_8h.html#a7">string-list.h</a><li>stp_string_list_count()
-: <a class="el" href="string-list_8h.html#a5">string-list.h</a><li>stp_string_list_create()
-: <a class="el" href="string-list_8h.html#a1">string-list.h</a><li>stp_string_list_create_copy()
-: <a class="el" href="string-list_8h.html#a6">string-list.h</a><li>stp_string_list_create_from_params()
-: <a class="el" href="string-list_8h.html#a9">string-list.h</a><li>stp_string_list_destroy()
-: <a class="el" href="string-list_8h.html#a2">string-list.h</a><li>stp_string_list_find()
-: <a class="el" href="string-list_8h.html#a4">string-list.h</a><li>stp_string_list_is_present()
-: <a class="el" href="string-list_8h.html#a10">string-list.h</a><li>stp_string_list_param()
-: <a class="el" href="string-list_8h.html#a3">string-list.h</a><li>stp_string_list_remove_string()
-: <a class="el" href="string-list_8h.html#a8">string-list.h</a><li>stp_strlen()
-: <a class="el" href="group__util.html#ga28">util.h</a><li>stp_strndup()
-: <a class="el" href="group__util.html#ga29">util.h</a><li>stp_unpack_16()
-: <a class="el" href="bit-ops_8h.html#a6">bit-ops.h</a><li>stp_unpack_2()
-: <a class="el" href="bit-ops_8h.html#a3">bit-ops.h</a><li>stp_unpack_4()
-: <a class="el" href="bit-ops_8h.html#a4">bit-ops.h</a><li>stp_unpack_8()
-: <a class="el" href="bit-ops_8h.html#a5">bit-ops.h</a><li>stp_unregister_xml_parser()
-: <a class="el" href="xml_8h.html#a2">xml.h</a><li>stp_unregister_xml_preload()
-: <a class="el" href="xml_8h.html#a4">xml.h</a><li>stp_vars_copy()
-: <a class="el" href="group__vars.html#ga8">vars.h</a><li>stp_vars_create()
-: <a class="el" href="group__vars.html#ga7">vars.h</a><li>stp_vars_create_copy()
-: <a class="el" href="group__vars.html#ga9">vars.h</a><li>stp_vars_destroy()
-: <a class="el" href="group__vars.html#ga10">vars.h</a><li>stp_verify()
-: <a class="el" href="group__vars.html#ga122">vars.h</a><li>stp_verify_parameter()
-: <a class="el" href="group__vars.html#ga127">vars.h</a><li>stp_verify_printer_params()
-: <a class="el" href="group__printer.html#ga19">printers.h</a><li>stp_weave_parameters_by_row()
-: <a class="el" href="weave_8h.html#a25">weave.h</a><li>stp_write_weave()
-: <a class="el" href="weave_8h.html#a19">weave.h</a><li>stp_xml_exit()
-: <a class="el" href="xml_8h.html#a11">xml.h</a><li>stp_xml_get_node()
-: <a class="el" href="xml_8h.html#a12">xml.h</a><li>stp_xml_init()
-: <a class="el" href="xml_8h.html#a10">xml.h</a><li>stp_xml_init_defaults()
-: <a class="el" href="xml_8h.html#a5">xml.h</a><li>stp_xml_parse_file()
-: <a class="el" href="xml_8h.html#a6">xml.h</a><li>stp_xml_parse_file_named()
-: <a class="el" href="xml_8h.html#a21">xml.h</a><li>stp_xml_preinit()
-: <a class="el" href="xml_8h.html#a14">xml.h</a><li>stp_xmldoc_create_generic()
-: <a class="el" href="xml_8h.html#a13">xml.h</a><li>stp_xmlstrtod()
-: <a class="el" href="xml_8h.html#a9">xml.h</a><li>stp_xmlstrtol()
-: <a class="el" href="xml_8h.html#a7">xml.h</a><li>stp_xmlstrtoul()
-: <a class="el" href="xml_8h.html#a8">xml.h</a><li>stp_xmltree_create_from_array()
-: <a class="el" href="xml_8h.html#a20">xml.h</a><li>stp_xmltree_create_from_curve()
-: <a class="el" href="xml_8h.html#a18">xml.h</a><li>stp_xmltree_create_from_sequence()
-: <a class="el" href="xml_8h.html#a16">xml.h</a><li>stp_zalloc()
-: <a class="el" href="group__util.html#ga25">util.h</a><li>stp_zfwrite()
-: <a class="el" href="group__util.html#ga6">util.h</a><li>stp_zprintf()
-: <a class="el" href="group__util.html#ga5">util.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__util.html#g9b6b2745ee2d68d1ca356a79c50f0ed7">util.h</a><li>stp_allocate_component_data()
+: <a class="el" href="group__vars.html#geb61df54d59bfebdcb77b1e5e993ebaa">vars.h</a><li>stp_array_copy()
+: <a class="el" href="group__array.html#gab9b031be229d8762faf46a3ef9454ec">array.h</a><li>stp_array_create()
+: <a class="el" href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66">array.h</a><li>stp_array_create_copy()
+: <a class="el" href="group__array.html#g19370f7d4779013904be75bc3d97e024">array.h</a><li>stp_array_create_from_xmltree()
+: <a class="el" href="xml_8h.html#301d2355b8bb9986a7bc4f84cc6c9d40">xml.h</a><li>stp_array_destroy()
+: <a class="el" href="group__array.html#g562ad19d8ecc1e9bdd8c182b0a05ecec">array.h</a><li>stp_array_get_data()
+: <a class="el" href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be">array.h</a><li>stp_array_get_point()
+: <a class="el" href="group__array.html#gb9d53cf70f2c892dca82b8db2414fad2">array.h</a><li>stp_array_get_sequence()
+: <a class="el" href="group__array.html#g2051c3f4a1eaccb198744f8d7c76d649">array.h</a><li>stp_array_get_size()
+: <a class="el" href="group__array.html#g48e34b2673c2973884f0a403bafe7ea8">array.h</a><li>stp_array_set_data()
+: <a class="el" href="group__array.html#g0ca3891b4cde193cc65de63053e3f4fa">array.h</a><li>stp_array_set_point()
+: <a class="el" href="group__array.html#g4ab405205d678a3d9ae02a98103fbfea">array.h</a><li>stp_array_set_size()
+: <a class="el" href="group__array.html#g698e51815f2ef3fd0709d6b32a2bb921">array.h</a><li>stp_asprintf()
+: <a class="el" href="group__util.html#g6bdd7099220fe310b228dcff5159b8d9">util.h</a><li>stp_catprintf()
+: <a class="el" href="group__util.html#g34d3ebda7c5b75ab40d1600f4d79a4be">util.h</a><li>stp_channel_add()
+: <a class="el" href="channel_8h.html#6a552629f3dddf6283f605e1961dd04f">channel.h</a><li>stp_channel_convert()
+: <a class="el" href="channel_8h.html#cef9de964c7569983e1ff1d0550d3bd6">channel.h</a><li>stp_channel_get_black_channel()
+: <a class="el" href="channel_8h.html#00bbe8c93cbe8da9f431824dbb1dadcd">channel.h</a><li>stp_channel_get_curve()
+: <a class="el" href="channel_8h.html#619228b113312c73cdce75b15bb88313">channel.h</a><li>stp_channel_get_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#c868578c0a82a76d20160b23a9c9d603">channel.h</a><li>stp_channel_get_density_adjustment()
+: <a class="el" href="channel_8h.html#0cfa6ae42ced76291f96ff64fed6a823">channel.h</a><li>stp_channel_get_gcr_curve()
+: <a class="el" href="channel_8h.html#0f1e6073d53036f6771a0cc69cf9e261">channel.h</a><li>stp_channel_get_gloss_channel()
+: <a class="el" href="channel_8h.html#a907ffda300039a00ae7ddb333038480">channel.h</a><li>stp_channel_get_gloss_limit()
+: <a class="el" href="channel_8h.html#e1702ed4a233cadce00e9bc87fd5ca45">channel.h</a><li>stp_channel_get_ink_limit()
+: <a class="el" href="channel_8h.html#f6423b74581fbf34918a9e45d22186b5">channel.h</a><li>stp_channel_get_input()
+: <a class="el" href="channel_8h.html#f5ef85fbc689b2f94c0be23c0b8b3765">channel.h</a><li>stp_channel_get_output()
+: <a class="el" href="channel_8h.html#9c4df56f4ad83b6232cf6ec17b6dc031">channel.h</a><li>stp_channel_get_value()
+: <a class="el" href="channel_8h.html#73265490d8c513de68604a982ec49e0a">channel.h</a><li>stp_channel_initialize()
+: <a class="el" href="channel_8h.html#00b63c73990babb75e5896ffd7022634">channel.h</a><li>stp_channel_reset()
+: <a class="el" href="channel_8h.html#dc5c0cc7cc331da0ab394b642a381363">channel.h</a><li>stp_channel_reset_channel()
+: <a class="el" href="channel_8h.html#6a88eb8e1f968370b63326e517a34ec2">channel.h</a><li>stp_channel_set_black_channel()
+: <a class="el" href="channel_8h.html#6d315737ed90af4b0b9bff8c907381c3">channel.h</a><li>stp_channel_set_curve()
+: <a class="el" href="channel_8h.html#42d1438e758951e81ff49fbf81e73d2b">channel.h</a><li>stp_channel_set_cutoff_adjustment()
+: <a class="el" href="channel_8h.html#4a04bbe68bd5c97d4b83cb1c1a147b48">channel.h</a><li>stp_channel_set_density_adjustment()
+: <a class="el" href="channel_8h.html#99f818da3b4944b328de9de860d04dbc">channel.h</a><li>stp_channel_set_gcr_curve()
+: <a class="el" href="channel_8h.html#2ce95b47a5f1a6c146588e0fb49db2e4">channel.h</a><li>stp_channel_set_gloss_channel()
+: <a class="el" href="channel_8h.html#38a09aeef9c53c039fa7d1124921a7c9">channel.h</a><li>stp_channel_set_gloss_limit()
+: <a class="el" href="channel_8h.html#4349853a306208c7d98074a585991ef0">channel.h</a><li>stp_channel_set_ink_limit()
+: <a class="el" href="channel_8h.html#9351c3b60ed0f43e012bbd2906b0f0b4">channel.h</a><li>stp_check_array_parameter()
+: <a class="el" href="group__vars.html#gdf6c305c48d012bc138db025c9bd63df">vars.h</a><li>stp_check_boolean_parameter()
+: <a class="el" href="group__vars.html#gadfd66825dd58fb8e0851d493445c4e4">vars.h</a><li>stp_check_curve_parameter()
+: <a class="el" href="group__vars.html#geecfc1f1fdc97ea165ae35b64de95178">vars.h</a><li>stp_check_dimension_parameter()
+: <a class="el" href="group__vars.html#gcdfa2f747081721c03b10484a832a535">vars.h</a><li>stp_check_file_parameter()
+: <a class="el" href="group__vars.html#gb411dae8fb16ec9f289d4f2f1ecabcfc">vars.h</a><li>stp_check_float_parameter()
+: <a class="el" href="group__vars.html#g2deea3612965e28cd0d513c5850ca074">vars.h</a><li>stp_check_int_parameter()
+: <a class="el" href="group__vars.html#g056b021334fe812aa14bbbfd60aafba8">vars.h</a><li>stp_check_raw_parameter()
+: <a class="el" href="group__vars.html#g5bd30b408d6ec16b3999dce5e540a5fa">vars.h</a><li>stp_check_string_parameter()
+: <a class="el" href="group__vars.html#gae6b21f76f675516e9189c47444e17cf">vars.h</a><li>stp_check_version()
+: <a class="el" href="group__version.html#g888f2f6268a658d1a6b71b5288299488">gutenprint-version.h</a><li>stp_clear_array_parameter()
+: <a class="el" href="group__vars.html#gb9df68cbf9973203adfca5e1293b300a">vars.h</a><li>stp_clear_boolean_parameter()
+: <a class="el" href="group__vars.html#ge5b7e3356b3c1c893620fdeeea486e48">vars.h</a><li>stp_clear_curve_parameter()
+: <a class="el" href="group__vars.html#g9e992f880bd74cd4097527a39aea7125">vars.h</a><li>stp_clear_dimension_parameter()
+: <a class="el" href="group__vars.html#g28203d9250f232f9af290802cf2db881">vars.h</a><li>stp_clear_file_parameter()
+: <a class="el" href="group__vars.html#g7acde85eb361525f5cf481bafddbc1bd">vars.h</a><li>stp_clear_float_parameter()
+: <a class="el" href="group__vars.html#g740a5cab681f30b8cc5e4ca18197e472">vars.h</a><li>stp_clear_int_parameter()
+: <a class="el" href="group__vars.html#g4841e9250e4c7f38f2267355402ffcc1">vars.h</a><li>stp_clear_raw_parameter()
+: <a class="el" href="group__vars.html#ga79b051578077beca548be224062705c">vars.h</a><li>stp_clear_string_parameter()
+: <a class="el" href="group__vars.html#gc7fe8cd335309d755fe5b54bf6b8e5a3">vars.h</a><li>stp_color_count()
+: <a class="el" href="group__color.html#ga8b8b19da7bcc9bc814fe0f97f39b3ed">color.h</a><li>stp_color_describe_parameter()
+: <a class="el" href="group__color.html#gc47fecc2c32115494ea364e53d9f1ff2">color.h</a><li>stp_color_get_long_name()
+: <a class="el" href="group__color.html#ga0559d7812bdcbebe4edc14fc05274d9">color.h</a><li>stp_color_get_name()
+: <a class="el" href="group__color.html#g36d2d72d2cd967405a978b76a7a8c992">color.h</a><li>stp_color_get_row()
+: <a class="el" href="group__color.html#gadf861820b3956ef7b18600dbf5da9da">color.h</a><li>stp_color_init()
+: <a class="el" href="group__color.html#g835bd7024477347a46ea0c14b46996c6">color.h</a><li>stp_color_list_parameters()
+: <a class="el" href="group__color.html#ge2e397268288111eaffd352cb0ff1b98">color.h</a><li>stp_color_register()
+: <a class="el" href="group__color.html#ge3543409e331c5d1756c2c8fe927343b">color.h</a><li>stp_color_unregister()
+: <a class="el" href="group__color.html#g3e0f2728d47e1701c00b06199bc5512d">color.h</a><li>stp_copy_options()
+: <a class="el" href="group__vars.html#gbd8b19b70d2f2fc7dcd7c896b3ed5d98">vars.h</a><li>stp_curve_cache_copy()
+: <a class="el" href="curve-cache_8h.html#6a8addcc359b8cfbc2fa5c8cec97643d">curve-cache.h</a><li>stp_curve_cache_curve_data()
+: <a class="el" href="curve-cache_8h.html#5cb281dd07eecda913b168451b2d615b">curve-cache.h</a><li>stp_curve_cache_curve_invalidate()
+: <a class="el" href="curve-cache_8h.html#7966337362f5e8fc0ed54edd8da645a2">curve-cache.h</a><li>stp_curve_cache_get_count()
+: <a class="el" href="curve-cache_8h.html#723301540e82db80f8ce9100ec832876">curve-cache.h</a><li>stp_curve_cache_get_curve()
+: <a class="el" href="curve-cache_8h.html#256ae4356b6205ba61fbc6b5e90c1762">curve-cache.h</a><li>stp_curve_cache_get_double_data()
+: <a class="el" href="curve-cache_8h.html#83788e3f9d421bdab139d92127a7e5e3">curve-cache.h</a><li>stp_curve_cache_get_ushort_data()
+: <a class="el" href="curve-cache_8h.html#6a318767b044ac996ae318771f715a01">curve-cache.h</a><li>stp_curve_cache_set_curve()
+: <a class="el" href="curve-cache_8h.html#f775dcfafb717b24ff655cc801c14dfc">curve-cache.h</a><li>stp_curve_cache_set_curve_copy()
+: <a class="el" href="curve-cache_8h.html#33011bde2e051e0b222177b0db746da9">curve-cache.h</a><li>stp_curve_compose()
+: <a class="el" href="group__curve.html#g657e0ad5b93f090220d35be615fec5e4">curve.h</a><li>stp_curve_copy()
+: <a class="el" href="group__curve.html#gfdafb0a802f00063b00713dbd6d6bfc0">curve.h</a><li>stp_curve_count_points()
+: <a class="el" href="group__curve.html#g48d9023f28ae2d15975002f7a9d7f94e">curve.h</a><li>stp_curve_create()
+: <a class="el" href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6">curve.h</a><li>stp_curve_create_copy()
+: <a class="el" href="group__curve.html#ge76787e84f2fc3ba299de94f4ecc6d82">curve.h</a><li>stp_curve_create_from_file()
+: <a class="el" href="group__curve.html#g6ff03fcc2a47f297c48b683884e81924">curve.h</a><li>stp_curve_create_from_stream()
+: <a class="el" href="group__curve.html#g650e49e1250dab5d9221ad747a627fc0">curve.h</a><li>stp_curve_create_from_string()
+: <a class="el" href="group__curve.html#g60dce8c741a9b6fde73ced2134305298">curve.h</a><li>stp_curve_create_from_xmltree()
+: <a class="el" href="xml_8h.html#4b39835d489b183bdf939551f7b6871b">xml.h</a><li>stp_curve_destroy()
+: <a class="el" href="group__curve.html#g01bf94ed6a523f28dd909be054a69790">curve.h</a><li>stp_curve_free_curve_cache()
+: <a class="el" href="curve-cache_8h.html#3cef707d88b48136a52f733f80ae52dd">curve-cache.h</a><li>stp_curve_get_bounds()
+: <a class="el" href="group__curve.html#g4d32e3000dd3a8f258b2eab94797731b">curve.h</a><li>stp_curve_get_data()
+: <a class="el" href="group__curve.html#g24b9486c45d68983e94dcc0fb19edacd">curve.h</a><li>stp_curve_get_data_points()
+: <a class="el" href="group__curve.html#gd30e41654f1e0217aae3389b30cdffba">curve.h</a><li>stp_curve_get_float_data()
+: <a class="el" href="group__curve.html#gf363a0f9686bcd6521671d531bc522d5">curve.h</a><li>stp_curve_get_gamma()
+: <a class="el" href="group__curve.html#gc9786b35c2b1a55d54b62bcc57481c82">curve.h</a><li>stp_curve_get_int_data()
+: <a class="el" href="group__curve.html#g01bda0b947a6075d4a1ed373865744e6">curve.h</a><li>stp_curve_get_interpolation_type()
+: <a class="el" href="group__curve.html#gca245aa6907c2fb95e150ce9a86ddb1a">curve.h</a><li>stp_curve_get_long_data()
+: <a class="el" href="group__curve.html#g187af251d5a89853545c8be898a00cc1">curve.h</a><li>stp_curve_get_point()
+: <a class="el" href="group__curve.html#gf9ff6f55ec0a0615608dc1baec6aff00">curve.h</a><li>stp_curve_get_range()
+: <a class="el" href="group__curve.html#gaf8bad025ea7463067c9d7ab205af062">curve.h</a><li>stp_curve_get_sequence()
+: <a class="el" href="group__curve.html#gee3cc69ab758b400838014df4742c28e">curve.h</a><li>stp_curve_get_short_data()
+: <a class="el" href="group__curve.html#g60767bb2143fe4d491d351a4c0abc3b1">curve.h</a><li>stp_curve_get_subrange()
+: <a class="el" href="group__curve.html#gd4cfbfbfe0c16b8f2ef4d8c44d221172">curve.h</a><li>stp_curve_get_uint_data()
+: <a class="el" href="group__curve.html#gb874365285383f3eb35c1a32496a69b4">curve.h</a><li>stp_curve_get_ulong_data()
+: <a class="el" href="group__curve.html#g3ecbc0ce98e7bd7695002306f5a2ba1b">curve.h</a><li>stp_curve_get_ushort_data()
+: <a class="el" href="group__curve.html#gb2312169172ec9789af9fd38279b3273">curve.h</a><li>stp_curve_get_wrap()
+: <a class="el" href="group__curve.html#gd2aade6a22b516006ce0f897c5027f35">curve.h</a><li>stp_curve_interpolate_value()
+: <a class="el" href="group__curve.html#g0fdfc2b27a8a464584589ef38a8e05c4">curve.h</a><li>stp_curve_is_piecewise()
+: <a class="el" href="group__curve.html#gdda4313c874170e0086d2000ed04c02f">curve.h</a><li>stp_curve_resample()
+: <a class="el" href="group__curve.html#gf68cf2508ff4a14a0dbee6fc0001667e">curve.h</a><li>stp_curve_rescale()
+: <a class="el" href="group__curve.html#gd440d8d448173adc2be6737963a6e999">curve.h</a><li>stp_curve_set_bounds()
+: <a class="el" href="group__curve.html#g5283a18fcc5db8e9f9384d54de50ba83">curve.h</a><li>stp_curve_set_data()
+: <a class="el" href="group__curve.html#gba540befdbd82e705358b2175d5b92e8">curve.h</a><li>stp_curve_set_data_points()
+: <a class="el" href="group__curve.html#gcbd01a2662edb48af0816930b40dc8ab">curve.h</a><li>stp_curve_set_float_data()
+: <a class="el" href="group__curve.html#gc0401bfefa3990ca26a0fb7718f1ebb2">curve.h</a><li>stp_curve_set_gamma()
+: <a class="el" href="group__curve.html#g6548b7ca6ef6ab94fe1d927c246e7baf">curve.h</a><li>stp_curve_set_int_data()
+: <a class="el" href="group__curve.html#gbc9ae004e972c7d638336714f3112f9b">curve.h</a><li>stp_curve_set_interpolation_type()
+: <a class="el" href="group__curve.html#g3175711d943e95fdf363d5124237a56e">curve.h</a><li>stp_curve_set_long_data()
+: <a class="el" href="group__curve.html#gaf770dcae26ce48d5ee50dd8217e2c14">curve.h</a><li>stp_curve_set_point()
+: <a class="el" href="group__curve.html#g9a05eae4f274f420418539cceb627556">curve.h</a><li>stp_curve_set_short_data()
+: <a class="el" href="group__curve.html#gd23dcc9abefca9a98b3ecd9714227093">curve.h</a><li>stp_curve_set_subrange()
+: <a class="el" href="group__curve.html#g0ba6753a8beeaca19719d047da25ecb5">curve.h</a><li>stp_curve_set_uint_data()
+: <a class="el" href="group__curve.html#g8a215d4981a74fb2b6e4a0c381314df0">curve.h</a><li>stp_curve_set_ulong_data()
+: <a class="el" href="group__curve.html#g184e0e32892aae4b2c195c6fc880bace">curve.h</a><li>stp_curve_set_ushort_data()
+: <a class="el" href="group__curve.html#g4051de3e6be42f4499de78af67288616">curve.h</a><li>stp_curve_write()
+: <a class="el" href="group__curve.html#g6ef71ce7d92e659b1c902df29b1dcbc7">curve.h</a><li>stp_curve_write_string()
+: <a class="el" href="group__curve.html#g21aa4497c58ebbb703dc3549560f084d">curve.h</a><li>stp_default_media_size()
+: <a class="el" href="group__papersize.html#g2fe5d85acaa4ff8b8e4ad1ff3cccb027">paper.h</a><li>stp_default_settings()
+: <a class="el" href="group__vars.html#g9f897908b19f5f0cdaf75b483d46e041">vars.h</a><li>stp_deprintf()
+: <a class="el" href="group__util.html#gf7bc1bd0ff92ca0f6ba7d0eb559e1da3">util.h</a><li>stp_describe_output()
+: <a class="el" href="group__printer.html#g950e2cd193926440ba250dbc184d8588">printers.h</a><li>stp_describe_parameter()
+: <a class="el" href="group__vars.html#ged453c314365a3948b195e3175455a12">vars.h</a><li>stp_describe_resolution()
+: <a class="el" href="group__vars.html#g5735451225c2a355cb11c165e011637d">vars.h</a><li>stp_destroy_component_data()
+: <a class="el" href="group__vars.html#g089f9a34f26f700f43858ba3959d8f13">vars.h</a><li>stp_dither()
+: <a class="el" href="dither_8h.html#a22b0e4fe00acaf11ce611e29f1b1ba3">dither.h</a><li>stp_dither_add_channel()
+: <a class="el" href="dither_8h.html#28bb47c7e1436e2c4af3b0be87b5d1c6">dither.h</a><li>stp_dither_describe_parameter()
+: <a class="el" href="dither_8h.html#6daf654828bc5235bc785fceb8aebb89">dither.h</a><li>stp_dither_get_channel()
+: <a class="el" href="dither_8h.html#94da054fb7a3f42cf4c2937f4d37e528">dither.h</a><li>stp_dither_get_first_position()
+: <a class="el" href="dither_8h.html#f113ac1043230813204db189e3fd84a8">dither.h</a><li>stp_dither_get_last_position()
+: <a class="el" href="dither_8h.html#e13f1c62835c48c5fb58b45c8ed35f32">dither.h</a><li>stp_dither_init()
+: <a class="el" href="dither_8h.html#6d409bf6395231621a725a45fac8bb8e">dither.h</a><li>stp_dither_internal()
+: <a class="el" href="dither_8h.html#e1fe7fb65133dd6ffc227e6fcdd18fdd">dither.h</a><li>stp_dither_list_parameters()
+: <a class="el" href="dither_8h.html#9ad687cfc22956dd88495ae0a831c1b6">dither.h</a><li>stp_dither_matrix_clone()
+: <a class="el" href="dither_8h.html#aaa6d937beb5f9bef6e7ec34fc776d54">dither.h</a><li>stp_dither_matrix_copy()
+: <a class="el" href="dither_8h.html#289ae89081129060bf67371d7ce9fcef">dither.h</a><li>stp_dither_matrix_destroy()
+: <a class="el" href="dither_8h.html#361cf36b4875e8ef2c8152f66d4a9284">dither.h</a><li>stp_dither_matrix_init()
+: <a class="el" href="dither_8h.html#8346fdae0bfb7422f52c0a2eec3abd87">dither.h</a><li>stp_dither_matrix_init_from_dither_array()
+: <a class="el" href="dither_8h.html#a9efd9cefabdab92a8ce5fbf7aca8876">dither.h</a><li>stp_dither_matrix_init_short()
+: <a class="el" href="dither_8h.html#6a7a7142c53dd1cd70b3f7fb481e5564">dither.h</a><li>stp_dither_matrix_iterated_init()
+: <a class="el" href="dither_8h.html#e79d2866600d79be412b660f036995f4">dither.h</a><li>stp_dither_matrix_scale_exponentially()
+: <a class="el" href="dither_8h.html#0d1f33cd934e13ed0b0f859d131efbc1">dither.h</a><li>stp_dither_matrix_set_row()
+: <a class="el" href="dither_8h.html#c329929a25c54355a7ed23f23616ced5">dither.h</a><li>stp_dither_matrix_shear()
+: <a class="el" href="dither_8h.html#1c29e4d285f27f7fd300643f7023f305">dither.h</a><li>stp_dither_matrix_validate_array()
+: <a class="el" href="dither_8h.html#05677f96e6de536ecf91a65ee0715998">dither.h</a><li>stp_dither_set_adaptive_limit()
+: <a class="el" href="dither_8h.html#d261306c74a8affdf11ad2cc519e8bba">dither.h</a><li>stp_dither_set_ink_spread()
+: <a class="el" href="dither_8h.html#744fa9a5d204da486f07a8f1b21c9ba3">dither.h</a><li>stp_dither_set_inks()
+: <a class="el" href="dither_8h.html#fd1d75ef5cfb0e013601a4e084352786">dither.h</a><li>stp_dither_set_inks_full()
+: <a class="el" href="dither_8h.html#0aae5a947e8953323b097fbb79c93c68">dither.h</a><li>stp_dither_set_inks_simple()
+: <a class="el" href="dither_8h.html#ffc1834e675956e79ae5a866895db39c">dither.h</a><li>stp_dither_set_iterated_matrix()
+: <a class="el" href="dither_8h.html#85eb5568b8a8036271e50794519c08e2">dither.h</a><li>stp_dither_set_matrix()
+: <a class="el" href="dither_8h.html#25b3d76810fd0dcb0928edff37060409">dither.h</a><li>stp_dither_set_matrix_from_dither_array()
+: <a class="el" href="dither_8h.html#ae5be944ec353d075ea17c32370270bd">dither.h</a><li>stp_dither_set_randomizer()
+: <a class="el" href="dither_8h.html#6d8fc8a344a764f92ee43ff8b959aace">dither.h</a><li>stp_dither_set_transition()
+: <a class="el" href="dither_8h.html#d7cd0b4e7bf474516b14d0a186b23b96">dither.h</a><li>stp_dprintf()
+: <a class="el" href="group__util.html#g24e214e32810cc67c493c270a6ad83d6">util.h</a><li>stp_end_job()
+: <a class="el" href="group__printer.html#g40637834f08a166992325af09f6a6030">printers.h</a><li>stp_eprintf()
+: <a class="el" href="group__util.html#g47c73485971132d9b41a33bdf572f670">util.h</a><li>stp_erprintf()
+: <a class="el" href="group__util.html#g5f6389ed7d500f851cabe8425a158e4b">util.h</a><li>stp_erputc()
+: <a class="el" href="group__util.html#g859b75eddde620338859121451096097">util.h</a><li>stp_family_register()
+: <a class="el" href="group__printer.html#g82b22438444849bdedb4cfbe22f209e8">printers.h</a><li>stp_family_unregister()
+: <a class="el" href="group__printer.html#ga2ab30a5e5442b7a552fc3b884e1511b">printers.h</a><li>stp_fill_parameter_settings()
+: <a class="el" href="group__vars.html#g6a08746f33133e8873236b35eb1e7a62">vars.h</a><li>stp_find_standard_dither_array()
+: <a class="el" href="dither_8h.html#ef8ca9aa08ab848746e370100a4b20e2">dither.h</a><li>stp_flush_all()
+: <a class="el" href="weave_8h.html#5b0aac599abc4859e2d208db7185cdbf">weave.h</a><li>stp_flush_debug_messages()
+: <a class="el" href="group__util.html#gf39c22b74843750ca74a6caccb263c7c">util.h</a><li>stp_fold()
+: <a class="el" href="bit-ops_8h.html#ec711fffd61ebd40a6896d76d4c9327f">bit-ops.h</a><li>stp_free()
+: <a class="el" href="group__util.html#gabf89ff6213b9dc568fbdd1342b663ad">util.h</a><li>stp_get_array_parameter()
+: <a class="el" href="group__vars.html#gb918206f9b70fff5d58a16a762295981">vars.h</a><li>stp_get_array_parameter_active()
+: <a class="el" href="group__vars.html#g64e5f74483ffb7bd4412f4eefeb22250">vars.h</a><li>stp_get_boolean_parameter()
+: <a class="el" href="group__vars.html#g4cc8b69619067f882035cca46e9ce0cd">vars.h</a><li>stp_get_boolean_parameter_active()
+: <a class="el" href="group__vars.html#g361d0ba27ad2ec9e99e5eec05f2e76a6">vars.h</a><li>stp_get_color_by_colorfuncs()
+: <a class="el" href="group__color.html#ga92373d7aa315ab6e32a1bb0ac944b79">color.h</a><li>stp_get_color_by_index()
+: <a class="el" href="group__color.html#ga5ddc4c9d02576154d0b2c6c64a6a033">color.h</a><li>stp_get_color_by_name()
+: <a class="el" href="group__color.html#g25d9ee3ceee6d6e9964007ad12f9900b">color.h</a><li>stp_get_color_conversion()
+: <a class="el" href="group__vars.html#g087136342c500c138d73dbe0e2aad11a">vars.h</a><li>stp_get_component_data()
+: <a class="el" href="group__vars.html#g8eea0724106ea7174b808026ae8d1a5c">vars.h</a><li>stp_get_curve_parameter()
+: <a class="el" href="group__vars.html#g1a5a2746548465d681d00c6301a26100">vars.h</a><li>stp_get_curve_parameter_active()
+: <a class="el" href="group__vars.html#gb686075ecbdf349387c356826b432191">vars.h</a><li>stp_get_debug_level()
+: <a class="el" href="group__util.html#g9ab4c35dd4b6e142281ff36ecedee27e">util.h</a><li>stp_get_dimension_parameter()
+: <a class="el" href="group__vars.html#gb4121cba599314c929d04cce0e850473">vars.h</a><li>stp_get_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g8125d08f90002e654f2e45427e2f0251">vars.h</a><li>stp_get_driver()
+: <a class="el" href="group__vars.html#gcf8efdb6fd9847e41c85f9491a252f01">vars.h</a><li>stp_get_errdata()
+: <a class="el" href="group__vars.html#ge66b9c64f5821ee6e95f4b9e18cadd4e">vars.h</a><li>stp_get_errfunc()
+: <a class="el" href="group__vars.html#g9fe5b4efdfaa3e79918dd5079e61e2c5">vars.h</a><li>stp_get_file_parameter()
+: <a class="el" href="group__vars.html#g5efb45e6883a2522fd7e78c6eb761c79">vars.h</a><li>stp_get_file_parameter_active()
+: <a class="el" href="group__vars.html#g0f09e85b570ffee4a4d94853bb22bcb3">vars.h</a><li>stp_get_float_parameter()
+: <a class="el" href="group__vars.html#g46195f69cc57bd18a4cde5756dd84601">vars.h</a><li>stp_get_float_parameter_active()
+: <a class="el" href="group__vars.html#g28d01beda4b54cec395654847dbbc301">vars.h</a><li>stp_get_height()
+: <a class="el" href="group__vars.html#g7623276e130cb684670ecb153300ebaf">vars.h</a><li>stp_get_imageable_area()
+: <a class="el" href="group__vars.html#gebcb03afca6bb0d94e71bdf570d09af9">vars.h</a><li>stp_get_int_parameter()
+: <a class="el" href="group__vars.html#g22bc2b8307fb6a95dac7fcf3d35bf6b9">vars.h</a><li>stp_get_int_parameter_active()
+: <a class="el" href="group__vars.html#gac76d8e06c3ce3fb0f27c0c80d6ad5fc">vars.h</a><li>stp_get_left()
+: <a class="el" href="group__vars.html#gd3fbd778898c2b0fba19d0937fb939f5">vars.h</a><li>stp_get_lineactive_by_pass()
+: <a class="el" href="weave_8h.html#14c1a0f43a0353f7771632d3a0356cea">weave.h</a><li>stp_get_linebases_by_pass()
+: <a class="el" href="weave_8h.html#207eac262dceb86f20fe32b048b257ad">weave.h</a><li>stp_get_linecount_by_pass()
+: <a class="el" href="weave_8h.html#46dacaec8d953a33f6c15299f3a91046">weave.h</a><li>stp_get_lineoffsets_by_pass()
+: <a class="el" href="weave_8h.html#816c57bb673bebebaa42576b3e452206">weave.h</a><li>stp_get_media_size()
+: <a class="el" href="group__vars.html#ge690d9171bcdb0fedf981804bb923fac">vars.h</a><li>stp_get_model_id()
+: <a class="el" href="group__printer.html#gc09e99e20c8a19a13a5fb6356742a92a">printers.h</a><li>stp_get_outdata()
+: <a class="el" href="group__vars.html#g54e35f94578f346c07718587f18b049c">vars.h</a><li>stp_get_outfunc()
+: <a class="el" href="group__vars.html#g095834813ebbe8985d443e1fa78a0b98">vars.h</a><li>stp_get_page_height()
+: <a class="el" href="group__vars.html#g94d8cf912e3b036f67bc2d4c37d733ff">vars.h</a><li>stp_get_page_width()
+: <a class="el" href="group__vars.html#gea14f3cad139fc5b8d547a252deacff3">vars.h</a><li>stp_get_papersize_by_index()
+: <a class="el" href="group__papersize.html#g08bb891f58a7decfee2b073c00715993">paper.h</a><li>stp_get_papersize_by_name()
+: <a class="el" href="group__papersize.html#g9d655e3de6954ad3c5933dc736d2509a">paper.h</a><li>stp_get_papersize_by_size()
+: <a class="el" href="group__papersize.html#g0438b0e4729f37579900b591e801f8ce">paper.h</a><li>stp_get_parameter_list()
+: <a class="el" href="group__vars.html#g955b215a88b868cfc74d7a340de9b8f6">vars.h</a><li>stp_get_pass_by_pass()
+: <a class="el" href="weave_8h.html#129f77403ade9f504dd38185a7ab6209">weave.h</a><li>stp_get_printer()
+: <a class="el" href="group__printer.html#gcb4cdcada01ff29c5fd4ffeaa576db9e">printers.h</a><li>stp_get_printer_by_driver()
+: <a class="el" href="group__printer.html#g947fa230e08f9c854ca2608e76bd0d58">printers.h</a><li>stp_get_printer_by_index()
+: <a class="el" href="group__printer.html#g1286559c60d239563f9f15fdd27996e0">printers.h</a><li>stp_get_printer_by_long_name()
+: <a class="el" href="group__printer.html#gc041944e528afcb9a795eb6ece3fc6ff">printers.h</a><li>stp_get_printer_index_by_driver()
+: <a class="el" href="group__printer.html#g6f32b0213b580bf081fc8752a3eb04a1">printers.h</a><li>stp_get_raw_parameter()
+: <a class="el" href="group__vars.html#g9f4db93fc31ad52018bc3ad14b58bfc2">vars.h</a><li>stp_get_raw_parameter_active()
+: <a class="el" href="group__vars.html#g57abcfb2fa58e743f9d30f579481845a">vars.h</a><li>stp_get_release_version()
+: <a class="el" href="group__util.html#ged2a65d98cba1fd6d48c0cc1b611ae0f">util.h</a><li>stp_get_size_limit()
+: <a class="el" href="group__vars.html#gf2c1a37f8d837fae61bb18de1cd7bdc3">vars.h</a><li>stp_get_string_parameter()
+: <a class="el" href="group__vars.html#ga59b141facb320c409d9071f469fdbc5">vars.h</a><li>stp_get_string_parameter_active()
+: <a class="el" href="group__vars.html#gda8dd20ab17a9b403c68b4cd86fb529c">vars.h</a><li>stp_get_top()
+: <a class="el" href="group__vars.html#gcda38fc8e26a75c2b5d246b4341a8fd3">vars.h</a><li>stp_get_verified()
+: <a class="el" href="group__vars.html#ga1b826f02f84aa038c6862575770b629">vars.h</a><li>stp_get_version()
+: <a class="el" href="group__util.html#g77022a2cfde3a9ba9269f1bc3726175c">util.h</a><li>stp_get_width()
+: <a class="el" href="group__vars.html#g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1">vars.h</a><li>stp_image_conclude()
+: <a class="el" href="group__image.html#gd1017f2f9b91d7add73c2393d96f700a">image.h</a><li>stp_image_get_appname()
+: <a class="el" href="group__image.html#gd36123431e93e049d813894aa039c25c">image.h</a><li>stp_image_get_row()
+: <a class="el" href="group__image.html#gfc93a7a3f6629f6826bf1f6f757f464e">image.h</a><li>stp_image_height()
+: <a class="el" href="group__image.html#g48a99a9a8493b75687ad0900664ca4cb">image.h</a><li>stp_image_init()
+: <a class="el" href="group__image.html#g74c2417d571861506be7209421a3b418">image.h</a><li>stp_image_reset()
+: <a class="el" href="group__image.html#g69cd20ccb54500d0ee8cf38969db69a6">image.h</a><li>stp_image_width()
+: <a class="el" href="group__image.html#g9ee4915d4a1007f2d9c730ddc96d931b">image.h</a><li>stp_init()
+: <a class="el" href="group__util.html#g69354e5830712093045a4ba290a298f8">util.h</a><li>stp_init_debug_messages()
+: <a class="el" href="group__util.html#g26a43ceec27ca34bc49f4806900b4618">util.h</a><li>stp_initialize_printer_defaults()
+: <a class="el" href="group__printer.html#gc9aba62164667822fd9f110740bab570">printers.h</a><li>stp_initialize_weave()
+: <a class="el" href="weave_8h.html#9b72df98be9b9e25b42aca6ef5901d35">weave.h</a><li>stp_known_papersizes()
+: <a class="el" href="group__papersize.html#g93eb4d6bc44914b3ea6b184e076a0853">paper.h</a><li>stp_list_copy()
+: <a class="el" href="group__list.html#g3bd2f5a42d3313287017bfe20859c2d9">list.h</a><li>stp_list_create()
+: <a class="el" href="group__list.html#gaf10e4bb8ce6a8b6f5f015475400eb1b">list.h</a><li>stp_list_destroy()
+: <a class="el" href="group__list.html#g1382e926901b5efa2356176826a96a1a">list.h</a><li>stp_list_get_copyfunc()
+: <a class="el" href="group__list.html#g310dd79907494b07d9005fbf50b9eb0c">list.h</a><li>stp_list_get_end()
+: <a class="el" href="group__list.html#g2ef0298e970fdb93955860e7ee3f878c">list.h</a><li>stp_list_get_freefunc()
+: <a class="el" href="group__list.html#g9d344e3c6874e6033f8fc71370678bcf">list.h</a><li>stp_list_get_item_by_index()
+: <a class="el" href="group__list.html#g9885458dd0f6e6fe5c88c4b2b0643e2a">list.h</a><li>stp_list_get_item_by_long_name()
+: <a class="el" href="group__list.html#gdbf12ab6f47d68f2605f211023c4f520">list.h</a><li>stp_list_get_item_by_name()
+: <a class="el" href="group__list.html#g0fd0ea2439ab2b0c9b9fb97f14c9a470">list.h</a><li>stp_list_get_length()
+: <a class="el" href="group__list.html#g013ca40ec7e5714fc5ee5f31ac5582bc">list.h</a><li>stp_list_get_long_namefunc()
+: <a class="el" href="group__list.html#ga95d8ace9b6ec71388007024c51865cb">list.h</a><li>stp_list_get_namefunc()
+: <a class="el" href="group__list.html#g468cc0a5dfb1bfbef9eebd8d4f644492">list.h</a><li>stp_list_get_sortfunc()
+: <a class="el" href="group__list.html#ga759fd3cb97b9f651424b8a8fb6bedaa">list.h</a><li>stp_list_get_start()
+: <a class="el" href="group__list.html#ga67c8173f8c7b2c40e3d6dde6578faec">list.h</a><li>stp_list_item_create()
+: <a class="el" href="group__list.html#g50f49648801707436012cd5dc66b1f8c">list.h</a><li>stp_list_item_destroy()
+: <a class="el" href="group__list.html#gde2acf279e8ea067fdc1f3f951d0b373">list.h</a><li>stp_list_item_get_data()
+: <a class="el" href="group__list.html#g5b7d8ffea5a806953a43aee961a60fe4">list.h</a><li>stp_list_item_next()
+: <a class="el" href="group__list.html#gea9c1b6daae518ebecd2981289c555f3">list.h</a><li>stp_list_item_prev()
+: <a class="el" href="group__list.html#gcee23493eafdfcfce51e2ccf29ebbf54">list.h</a><li>stp_list_item_set_data()
+: <a class="el" href="group__list.html#g1b5d2889a81d712c3ba024e53bfd0f38">list.h</a><li>stp_list_node_free_data()
+: <a class="el" href="group__list.html#gb357e17f729e41b4f96d6aada1be26b9">list.h</a><li>stp_list_set_copyfunc()
+: <a class="el" href="group__list.html#gec59dd3b87efc811ef2b6303102ed279">list.h</a><li>stp_list_set_freefunc()
+: <a class="el" href="group__list.html#gc103cb4ff8870b3a8d90b6ebcade2498">list.h</a><li>stp_list_set_long_namefunc()
+: <a class="el" href="group__list.html#g42bdba5fcb861bdf8facb9135039d9b8">list.h</a><li>stp_list_set_namefunc()
+: <a class="el" href="group__list.html#g97d7c6d659aa7d05bc54a349a07e10c0">list.h</a><li>stp_list_set_sortfunc()
+: <a class="el" href="group__list.html#gbad08ce8ef257dae054ea3816ae88fe7">list.h</a><li>stp_malloc()
+: <a class="el" href="group__util.html#g7c76d059684ee6dc5bdc06e4b3af18ef">util.h</a><li>stp_merge_printvars()
+: <a class="el" href="group__vars.html#gc970fc314c6418d9193d93c787b908d9">vars.h</a><li>stp_module_close()
+: <a class="el" href="module_8h.html#8e114f6e561ea2a5c4186b31eea363ad">module.h</a><li>stp_module_exit()
+: <a class="el" href="module_8h.html#a5bfe6fda569e476ad52024d31eca3c4">module.h</a><li>stp_module_get_class()
+: <a class="el" href="module_8h.html#60ee652d3ddc0bf99abc8155b4e35a01">module.h</a><li>stp_module_init()
+: <a class="el" href="module_8h.html#8d52ac8df2ff7c4a28900fbb598c4848">module.h</a><li>stp_module_load()
+: <a class="el" href="module_8h.html#b07deb48be35f70644fcc6013b4debd9">module.h</a><li>stp_module_open()
+: <a class="el" href="module_8h.html#401000da13e2a7aacab2738838bf1fb2">module.h</a><li>stp_mxmlAdd()
+: <a class="el" href="mxml_8h.html#f5b1214c9e580debaf0350f31d03467d">mxml.h</a><li>stp_mxmlDelete()
+: <a class="el" href="mxml_8h.html#cbdf0579701e7776af87fbb3c2bf9469">mxml.h</a><li>stp_mxmlElementGetAttr()
+: <a class="el" href="mxml_8h.html#23f0ed075c389d9681fb5ed3c2ecddb9">mxml.h</a><li>stp_mxmlElementSetAttr()
+: <a class="el" href="mxml_8h.html#eae678d773da3b4075f1feea1b14eb84">mxml.h</a><li>stp_mxmlFindElement()
+: <a class="el" href="mxml_8h.html#7c0efd099878ce90b220bf4c51324cce">mxml.h</a><li>stp_mxmlLoadFile()
+: <a class="el" href="mxml_8h.html#db392c4e623e72d2b1985058564abf5d">mxml.h</a><li>stp_mxmlLoadString()
+: <a class="el" href="mxml_8h.html#9e275680a5730ef159757b20e041723d">mxml.h</a><li>stp_mxmlNewElement()
+: <a class="el" href="mxml_8h.html#305b60c2a9554ac30bb195e42cc82e75">mxml.h</a><li>stp_mxmlNewInteger()
+: <a class="el" href="mxml_8h.html#e65d5658c5271a9e26c5a21bc0cc2f20">mxml.h</a><li>stp_mxmlNewOpaque()
+: <a class="el" href="mxml_8h.html#533ea6ec53f37f8bdd2d89d667b0d10a">mxml.h</a><li>stp_mxmlNewReal()
+: <a class="el" href="mxml_8h.html#7754bd0d9af2be6edaeac7edf9c89c93">mxml.h</a><li>stp_mxmlNewText()
+: <a class="el" href="mxml_8h.html#41566f9adbe5fe307a4643e073e3d914">mxml.h</a><li>stp_mxmlRemove()
+: <a class="el" href="mxml_8h.html#6abe55831d77332db6b94b6cc0caaf02">mxml.h</a><li>stp_mxmlSaveAllocString()
+: <a class="el" href="mxml_8h.html#e3723cad1353a2142fc1abaee599380c">mxml.h</a><li>stp_mxmlSaveFile()
+: <a class="el" href="mxml_8h.html#bfabbd9dfdce248edc2f47de1faee7c3">mxml.h</a><li>stp_mxmlSaveString()
+: <a class="el" href="mxml_8h.html#18d0fb42d5adb6b4337df82e61116050">mxml.h</a><li>stp_mxmlWalkNext()
+: <a class="el" href="mxml_8h.html#be88dab827e68c48b822c6250731fc57">mxml.h</a><li>stp_mxmlWalkPrev()
+: <a class="el" href="mxml_8h.html#112485e5f15808619af7dd558528323f">mxml.h</a><li>stp_parameter_description_destroy()
+: <a class="el" href="group__vars.html#gc5a3eb0348d31acf60772265c3896542">vars.h</a><li>stp_parameter_find()
+: <a class="el" href="group__vars.html#g3dea1f995d40482b9f6470fedd994f95">vars.h</a><li>stp_parameter_find_in_settings()
+: <a class="el" href="group__vars.html#g711cf3e5e52fd3434ef7a9d16654aea8">vars.h</a><li>stp_parameter_list_add_param()
+: <a class="el" href="group__vars.html#ga8dc4ff543dbc1882d673b25234088b6">vars.h</a><li>stp_parameter_list_append()
+: <a class="el" href="group__vars.html#gf8aa1d7aba11de5fdee95b9cb339be61">vars.h</a><li>stp_parameter_list_copy()
+: <a class="el" href="group__vars.html#g62c6225b0721d5c80d889edc307f0b6b">vars.h</a><li>stp_parameter_list_count()
+: <a class="el" href="group__vars.html#gf69f651a798e9f06c67baf06f0754228">vars.h</a><li>stp_parameter_list_create()
+: <a class="el" href="group__vars.html#g3c1ddd3c10c367c0912fdd841576278f">vars.h</a><li>stp_parameter_list_destroy()
+: <a class="el" href="group__vars.html#gd0f6c2b153638f551d7709780eb7276a">vars.h</a><li>stp_parameter_list_param()
+: <a class="el" href="group__vars.html#g96fc73864dfc00ae418f14a81c72be26">vars.h</a><li>stp_path_search()
+: <a class="el" href="path_8h.html#8591072873a5ee644a6dd22538d84c55">path.h</a><li>stp_path_split()
+: <a class="el" href="path_8h.html#bc40460305f1f4f972c08a439f406449">path.h</a><li>stp_print()
+: <a class="el" href="group__printer.html#g121125e6646c6f6d8965f1857450749e">printers.h</a><li>stp_printer_describe_parameter()
+: <a class="el" href="group__printer.html#g806f00d4167762c7a3d467ec37c8430e">printers.h</a><li>stp_printer_get_defaults()
+: <a class="el" href="group__printer.html#ge67398e65540b835f5c5d073c5ea0ec1">printers.h</a><li>stp_printer_get_driver()
+: <a class="el" href="group__printer.html#g6c6c426f86307660079277ab6e90ae3d">printers.h</a><li>stp_printer_get_family()
+: <a class="el" href="group__printer.html#g9c98ccc58b2c6f9ed6bd1025220ff77d">printers.h</a><li>stp_printer_get_long_name()
+: <a class="el" href="group__printer.html#g00182878bdc39935e6382d7e41d55294">printers.h</a><li>stp_printer_get_manufacturer()
+: <a class="el" href="group__printer.html#gfc0382fd32b49ea9d171e4ce8b750c62">printers.h</a><li>stp_printer_get_model()
+: <a class="el" href="group__printer.html#g7ba104f0ea5ce4a88175486894010b71">printers.h</a><li>stp_printer_list_parameters()
+: <a class="el" href="group__printer.html#g666486047edfe4405d003b5c3bbe4b49">printers.h</a><li>stp_printer_model_count()
+: <a class="el" href="group__printer.html#gc0a8108170f5c86621de14296fd94b1e">printers.h</a><li>stp_prune_inactive_options()
+: <a class="el" href="group__util.html#gf64336e7c536a51d0debe88f1f5ec90a">util.h</a><li>stp_put16_be()
+: <a class="el" href="group__util.html#g3c20beae37d9841e095b336d6f7dcc1d">util.h</a><li>stp_put16_le()
+: <a class="el" href="group__util.html#g01199dc1d5a3db973d22cc9db00a4f41">util.h</a><li>stp_put32_be()
+: <a class="el" href="group__util.html#gbe0e31fbc0c4e6374903b25edc594f5e">util.h</a><li>stp_put32_le()
+: <a class="el" href="group__util.html#g0a445c531388afa31650ef4ccdac3ae1">util.h</a><li>stp_putc()
+: <a class="el" href="group__util.html#gf07e31a63021b4d504cc5a410e1aeb08">util.h</a><li>stp_puts()
+: <a class="el" href="group__util.html#g0a59761c8a4ee5f31cfb9bec2a9b00b4">util.h</a><li>stp_read_and_compose_curves()
+: <a class="el" href="group__util.html#g21168356d466d278f11dab2be8d0016e">util.h</a><li>stp_realloc()
+: <a class="el" href="group__util.html#g908f11aeabf31c8a9621bd65d408a5fc">util.h</a><li>stp_register_xml_parser()
+: <a class="el" href="xml_8h.html#3258e11973b45c04e9ec1810789cface">xml.h</a><li>stp_register_xml_preload()
+: <a class="el" href="xml_8h.html#0377f341fce4c764d695b851cf90125c">xml.h</a><li>stp_scale_float_parameter()
+: <a class="el" href="group__vars.html#gec605c647cab13d61ab5e2822d9f7ead">vars.h</a><li>stp_send_command()
+: <a class="el" href="group__util.html#g23ee64de1ec6ef5a4941ab80ba609840">util.h</a><li>stp_sequence_copy()
+: <a class="el" href="group__sequence.html#g5792d6f821525514199dd2d9b332ddd4">sequence.h</a><li>stp_sequence_create()
+: <a class="el" href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee">sequence.h</a><li>stp_sequence_create_copy()
+: <a class="el" href="group__sequence.html#gd37eb66db88ac93b853ba6e02b9155bc">sequence.h</a><li>stp_sequence_create_from_xmltree()
+: <a class="el" href="xml_8h.html#174add090763cd3d8a019da75257e9c5">xml.h</a><li>stp_sequence_destroy()
+: <a class="el" href="group__sequence.html#g98c9c2859d2ebe9b1987d26b62bd6ce0">sequence.h</a><li>stp_sequence_get_bounds()
+: <a class="el" href="group__sequence.html#g392e1da122d95d6fc07b6d73eff1d311">sequence.h</a><li>stp_sequence_get_data()
+: <a class="el" href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199">sequence.h</a><li>stp_sequence_get_float_data()
+: <a class="el" href="group__sequence.html#gf8cd9da688af479103cf8600e48f61c9">sequence.h</a><li>stp_sequence_get_int_data()
+: <a class="el" href="group__sequence.html#g4396baf0d338eec6f3bce3e2000da978">sequence.h</a><li>stp_sequence_get_long_data()
+: <a class="el" href="group__sequence.html#g864b55caa3a8c0e573031a36f57f7cc4">sequence.h</a><li>stp_sequence_get_point()
+: <a class="el" href="group__sequence.html#g044210129f28c298152ce124371324d4">sequence.h</a><li>stp_sequence_get_range()
+: <a class="el" href="group__sequence.html#gc2c70c539a3eced45be306d082faa3a6">sequence.h</a><li>stp_sequence_get_short_data()
+: <a class="el" href="group__sequence.html#g91a68efd6b99150739c7706f65703a2f">sequence.h</a><li>stp_sequence_get_size()
+: <a class="el" href="group__sequence.html#g99292c5ba10bcf1574c3e71a593c3e5f">sequence.h</a><li>stp_sequence_get_uint_data()
+: <a class="el" href="group__sequence.html#g204f77e91c9283dc6ec6e742687bb0db">sequence.h</a><li>stp_sequence_get_ulong_data()
+: <a class="el" href="group__sequence.html#gc4557b9fba98a7fbb4e17cc18fb0dded">sequence.h</a><li>stp_sequence_get_ushort_data()
+: <a class="el" href="group__sequence.html#g8bf46faeea891ac7ca699591df596bc1">sequence.h</a><li>stp_sequence_set_bounds()
+: <a class="el" href="group__sequence.html#gd56df3112937c11431e033f2d9574b96">sequence.h</a><li>stp_sequence_set_data()
+: <a class="el" href="group__sequence.html#g24024e771a50db02f2713b244212603e">sequence.h</a><li>stp_sequence_set_float_data()
+: <a class="el" href="group__sequence.html#g34a526cb5e72b611ac8a98b559c24e2e">sequence.h</a><li>stp_sequence_set_int_data()
+: <a class="el" href="group__sequence.html#gd4f058b2c690ad4e326970cc841d8f79">sequence.h</a><li>stp_sequence_set_long_data()
+: <a class="el" href="group__sequence.html#gd15e2cf350bb311da58f4b11240fa0f2">sequence.h</a><li>stp_sequence_set_point()
+: <a class="el" href="group__sequence.html#gf7f49101192387e29399ded6d3166d13">sequence.h</a><li>stp_sequence_set_short_data()
+: <a class="el" href="group__sequence.html#ge0d6719f863a10422dea23e7f4b4dd29">sequence.h</a><li>stp_sequence_set_size()
+: <a class="el" href="group__sequence.html#g166e9a610bd53cb812e328d9e111f240">sequence.h</a><li>stp_sequence_set_subrange()
+: <a class="el" href="group__sequence.html#g9b41ba7e0f1fb00cf19bbb9efe70824d">sequence.h</a><li>stp_sequence_set_uint_data()
+: <a class="el" href="group__sequence.html#g40cd6256eb5bb72decd60edd1dc3be54">sequence.h</a><li>stp_sequence_set_ulong_data()
+: <a class="el" href="group__sequence.html#gbc7ec322716d761436e4ad2d5d2f756f">sequence.h</a><li>stp_sequence_set_ushort_data()
+: <a class="el" href="group__sequence.html#g68aed44bbf6ede9ac49237091f2deb43">sequence.h</a><li>stp_set_array_parameter()
+: <a class="el" href="group__vars.html#g1f63514f8ffd8ea56f0beee69398ee01">vars.h</a><li>stp_set_array_parameter_active()
+: <a class="el" href="group__vars.html#gf2aada3c00f9b00bc6a65014da87e250">vars.h</a><li>stp_set_boolean_parameter()
+: <a class="el" href="group__vars.html#g8f67ed7dcee969e77374fb4daf468d58">vars.h</a><li>stp_set_boolean_parameter_active()
+: <a class="el" href="group__vars.html#ge12a7edf773cbe04fb98b171ba2c2fb9">vars.h</a><li>stp_set_color_conversion()
+: <a class="el" href="group__vars.html#g335e7eb264fa22343765146fb2318b31">vars.h</a><li>stp_set_color_conversion_n()
+: <a class="el" href="group__vars.html#g3164aa99994dabb561d6c295eb647123">vars.h</a><li>stp_set_curve_parameter()
+: <a class="el" href="group__vars.html#g5f4adaadb80cd2d94569881d96cfa02e">vars.h</a><li>stp_set_curve_parameter_active()
+: <a class="el" href="group__vars.html#g160150a3a39d66f5a807d1c750a57890">vars.h</a><li>stp_set_default_array_parameter()
+: <a class="el" href="group__vars.html#ga1620e4be3c7fb85262802338d3143f6">vars.h</a><li>stp_set_default_boolean_parameter()
+: <a class="el" href="group__vars.html#gd286782f691998858e30a202506bad74">vars.h</a><li>stp_set_default_curve_parameter()
+: <a class="el" href="group__vars.html#gdd7769bfece8597cde869eced1239a1e">vars.h</a><li>stp_set_default_dimension_parameter()
+: <a class="el" href="group__vars.html#g18b8a4fb414245d2c30df9ee11057845">vars.h</a><li>stp_set_default_file_parameter()
+: <a class="el" href="group__vars.html#gae28e4c640fba005a72e92af66327b50">vars.h</a><li>stp_set_default_file_parameter_n()
+: <a class="el" href="group__vars.html#gdeae102d1bd65147221f56e6095f35ef">vars.h</a><li>stp_set_default_float_parameter()
+: <a class="el" href="group__vars.html#g59b79c779211a72de534fb9e61548f97">vars.h</a><li>stp_set_default_int_parameter()
+: <a class="el" href="group__vars.html#gbf1d9c938d364598414e9f15c41c1f08">vars.h</a><li>stp_set_default_raw_parameter()
+: <a class="el" href="group__vars.html#gf95184ecee86a92db2a7d3f050154a46">vars.h</a><li>stp_set_default_string_parameter()
+: <a class="el" href="group__vars.html#g71306c3e3118d9a4545b0a3cefb863ea">vars.h</a><li>stp_set_default_string_parameter_n()
+: <a class="el" href="group__vars.html#g65b18994af3384af04e2bf77e288f54f">vars.h</a><li>stp_set_dimension_parameter()
+: <a class="el" href="group__vars.html#g778b0e43aad1e011012b8071b469c694">vars.h</a><li>stp_set_dimension_parameter_active()
+: <a class="el" href="group__vars.html#g6fa1953ee96051566a261f3391da3857">vars.h</a><li>stp_set_driver()
+: <a class="el" href="group__vars.html#ga8d9dbb1e613cfe2b119668158e35a76">vars.h</a><li>stp_set_driver_n()
+: <a class="el" href="group__vars.html#ge303a6ed77135b691ebbfd56cb577531">vars.h</a><li>stp_set_errdata()
+: <a class="el" href="group__vars.html#g7a006418c4dbb265be71f7b5a202455d">vars.h</a><li>stp_set_errfunc()
+: <a class="el" href="group__vars.html#ge89d8eb48e4a7a8107b87a44a4318064">vars.h</a><li>stp_set_file_parameter()
+: <a class="el" href="group__vars.html#g8134e4dc36b063a7d7dd229b9df32726">vars.h</a><li>stp_set_file_parameter_active()
+: <a class="el" href="group__vars.html#g8c04ab4487623a41e0b2600d466a88ad">vars.h</a><li>stp_set_file_parameter_n()
+: <a class="el" href="group__vars.html#g6e6c5474c253a452073eba25251a1481">vars.h</a><li>stp_set_float_parameter()
+: <a class="el" href="group__vars.html#g82f7bbcf639c60678c1dc2aee24e8a24">vars.h</a><li>stp_set_float_parameter_active()
+: <a class="el" href="group__vars.html#g38a95079fd6f90a0c6a92c5ddeb104ca">vars.h</a><li>stp_set_height()
+: <a class="el" href="group__vars.html#g68110f6d19b3987f6f66baee3926eb89">vars.h</a><li>stp_set_int_parameter()
+: <a class="el" href="group__vars.html#g8c6cd5f3bb3ab59a4f06c020c062c13e">vars.h</a><li>stp_set_int_parameter_active()
+: <a class="el" href="group__vars.html#g1c724bc85737bf8c698a08bc2d441b3e">vars.h</a><li>stp_set_left()
+: <a class="el" href="group__vars.html#g5d675ab9877df60ec467a20a0d62fcbc">vars.h</a><li>stp_set_outdata()
+: <a class="el" href="group__vars.html#g8fef23ae01a368f4d16ad95813d97d6d">vars.h</a><li>stp_set_outfunc()
+: <a class="el" href="group__vars.html#g30d5438686c8ead9a092f98bf3c3d8ca">vars.h</a><li>stp_set_output_codeset()
+: <a class="el" href="group__util.html#gf7978ce9e414b3d8ad905ee36a51cfbd">util.h</a><li>stp_set_page_height()
+: <a class="el" href="group__vars.html#g775714bf75f1fdbdd895f59edc9eca55">vars.h</a><li>stp_set_page_width()
+: <a class="el" href="group__vars.html#g751759cdeb8feb061c00f35d37fea45c">vars.h</a><li>stp_set_printer_defaults()
+: <a class="el" href="group__printer.html#gc3d8cdb65382cb13ea6b01072e6240d5">printers.h</a><li>stp_set_raw_parameter()
+: <a class="el" href="group__vars.html#gd40038a74fa7548da5fcaec6687c8787">vars.h</a><li>stp_set_raw_parameter_active()
+: <a class="el" href="group__vars.html#g9fe388535a67f8360ab21f58233c0e17">vars.h</a><li>stp_set_string_parameter()
+: <a class="el" href="group__vars.html#g22338d64a871a8b279fdee6fd83fff7f">vars.h</a><li>stp_set_string_parameter_active()
+: <a class="el" href="group__vars.html#g44793f2cf64b11917b8943d20ee43b9d">vars.h</a><li>stp_set_string_parameter_n()
+: <a class="el" href="group__vars.html#g5182246d4e0653f73dfaa40b62d4285f">vars.h</a><li>stp_set_top()
+: <a class="el" href="group__vars.html#gaa76e04fcde3aa6c162fb9d2fcaca251">vars.h</a><li>stp_set_verified()
+: <a class="el" href="group__vars.html#g8a2924dd6393431e994d22c704ec25fc">vars.h</a><li>stp_set_width()
+: <a class="el" href="group__vars.html#gdbdd8bad1742e87b5c5a299c2ebf7cf4">vars.h</a><li>stp_split_2()
+: <a class="el" href="bit-ops_8h.html#65a4f2dc6c49d8a80e1d0ca72a1f0ffd">bit-ops.h</a><li>stp_split_4()
+: <a class="el" href="bit-ops_8h.html#24f21e067782cbb1606f4109f7acaccb">bit-ops.h</a><li>stp_start_job()
+: <a class="el" href="group__printer.html#g9cf59fba866430dd47508bac6561ef67">printers.h</a><li>stp_strdup()
+: <a class="el" href="group__util.html#g2f861f4a98ad496ca8cd995147867f32">util.h</a><li>stp_string_list_add_string()
+: <a class="el" href="string-list_8h.html#b9e6a3a7944ca10102b1a30a3acc6767">string-list.h</a><li>stp_string_list_count()
+: <a class="el" href="string-list_8h.html#023eaab359b2f3c22d1a4fa7013e01ef">string-list.h</a><li>stp_string_list_create()
+: <a class="el" href="string-list_8h.html#65077aa7201209fcaa58553d904fbc34">string-list.h</a><li>stp_string_list_create_copy()
+: <a class="el" href="string-list_8h.html#e2f7a65ea28e02e39cc223898137127b">string-list.h</a><li>stp_string_list_create_from_params()
+: <a class="el" href="string-list_8h.html#a4938d0cb58828f5d27086ae9c400857">string-list.h</a><li>stp_string_list_destroy()
+: <a class="el" href="string-list_8h.html#35638794468f0bb0dd7b912dac655bd5">string-list.h</a><li>stp_string_list_find()
+: <a class="el" href="string-list_8h.html#25fd88ec425121519cc25d5279d29e6f">string-list.h</a><li>stp_string_list_is_present()
+: <a class="el" href="string-list_8h.html#333d878e45062e5f3ef5cf63602f4ce3">string-list.h</a><li>stp_string_list_param()
+: <a class="el" href="string-list_8h.html#997c38e27e8ad480118b84a6fdca4d79">string-list.h</a><li>stp_string_list_remove_string()
+: <a class="el" href="string-list_8h.html#26d7d318ddcbe976df1c91134d1ab262">string-list.h</a><li>stp_strlen()
+: <a class="el" href="group__util.html#g054943d301baecba82cdb78b7e454880">util.h</a><li>stp_strndup()
+: <a class="el" href="group__util.html#g2c6b28a35780bfa7d03a2f8381ee82c2">util.h</a><li>stp_unpack_16()
+: <a class="el" href="bit-ops_8h.html#d472146a7bdf6c1e95bcb102c4409515">bit-ops.h</a><li>stp_unpack_2()
+: <a class="el" href="bit-ops_8h.html#9772ac792d8208e341d780fc756bf3cd">bit-ops.h</a><li>stp_unpack_4()
+: <a class="el" href="bit-ops_8h.html#7fdd081b1a58cdc3648e61d23aefb744">bit-ops.h</a><li>stp_unpack_8()
+: <a class="el" href="bit-ops_8h.html#534a4a10cda717aabaf212954cc2d891">bit-ops.h</a><li>stp_unregister_xml_parser()
+: <a class="el" href="xml_8h.html#bdff70654d8ca31445e0957cfad68816">xml.h</a><li>stp_unregister_xml_preload()
+: <a class="el" href="xml_8h.html#f9605dfeaf5ba8c41b42aba2c09b4f20">xml.h</a><li>stp_vars_copy()
+: <a class="el" href="group__vars.html#g165ae58fed1515b5466ab1b84df85a86">vars.h</a><li>stp_vars_create()
+: <a class="el" href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a">vars.h</a><li>stp_vars_create_copy()
+: <a class="el" href="group__vars.html#g3c6d765cc5a27b322289e9baa9d97098">vars.h</a><li>stp_vars_destroy()
+: <a class="el" href="group__vars.html#g78259fcaa881655a07ef0b2b457bdf70">vars.h</a><li>stp_verify()
+: <a class="el" href="group__vars.html#ge28b0d78641811b1625a52971a2d11fa">vars.h</a><li>stp_verify_parameter()
+: <a class="el" href="group__vars.html#gf64e586fca554f2dd65157a76eaad34a">vars.h</a><li>stp_verify_printer_params()
+: <a class="el" href="group__printer.html#gd91f8e7a622725f0d47196cf912ddd8d">printers.h</a><li>stp_weave_parameters_by_row()
+: <a class="el" href="weave_8h.html#3dbb20fd24c73c2982819b1f184b7ee3">weave.h</a><li>stp_write_weave()
+: <a class="el" href="weave_8h.html#b021ec20fafa48e57495123df1533b62">weave.h</a><li>stp_xml_exit()
+: <a class="el" href="xml_8h.html#d35445001b4f0ff02b45cf411b056cb2">xml.h</a><li>stp_xml_get_node()
+: <a class="el" href="xml_8h.html#acec0c2b6d806a70b74c2c9efb5ca895">xml.h</a><li>stp_xml_init()
+: <a class="el" href="xml_8h.html#e279cdb2639cb00884563204c586e34a">xml.h</a><li>stp_xml_init_defaults()
+: <a class="el" href="xml_8h.html#9e2620e798edcd889cd80454374a0a1d">xml.h</a><li>stp_xml_parse_file()
+: <a class="el" href="xml_8h.html#477e8c523df78a068e98be5e929d6825">xml.h</a><li>stp_xml_parse_file_named()
+: <a class="el" href="xml_8h.html#2ff6722b18cd21c91e60e7ef1cedc0d4">xml.h</a><li>stp_xml_preinit()
+: <a class="el" href="xml_8h.html#e2aeb50ec9bffd4cc7ff4b8756ce503a">xml.h</a><li>stp_xmldoc_create_generic()
+: <a class="el" href="xml_8h.html#d698808efae24e1f0002243256171fc0">xml.h</a><li>stp_xmlstrtod()
+: <a class="el" href="xml_8h.html#666632a9a3cb7f802fd5478d68d57166">xml.h</a><li>stp_xmlstrtol()
+: <a class="el" href="xml_8h.html#56885d576d38f8fbffce10834e892117">xml.h</a><li>stp_xmlstrtoul()
+: <a class="el" href="xml_8h.html#9d7f6cba6d4f5b8b01b6d3c192d10596">xml.h</a><li>stp_xmltree_create_from_array()
+: <a class="el" href="xml_8h.html#90e7cdadf10d6492082fd008b79853b0">xml.h</a><li>stp_xmltree_create_from_curve()
+: <a class="el" href="xml_8h.html#286050c77ae8ee255a7b6035b88d5fb4">xml.h</a><li>stp_xmltree_create_from_sequence()
+: <a class="el" href="xml_8h.html#134d8ffe83aa1bc29ca65869af337479">xml.h</a><li>stp_zalloc()
+: <a class="el" href="group__util.html#gae1d98650ef9777ae4f4b10eae60b5c9">util.h</a><li>stp_zfwrite()
+: <a class="el" href="group__util.html#g9135d4c8cac78593aff55b668d09b79c">util.h</a><li>stp_zprintf()
+: <a class="el" href="group__util.html#g18aaa3874e4dd5259a4d182fa8d9c90a">util.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_type.html b/doc/gutenprint/html/globals_type.html
index e9ae4b2..eb9b536 100644
--- a/doc/gutenprint/html/globals_type.html
+++ b/doc/gutenprint/html/globals_type.html
@@ -2,61 +2,90 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_vars.html">Variables</a> | <a class="qindexHL" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li id="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>compdata_t
-: <a class="el" href="group__vars.html#ga6">vars.h</a></ul>
+: <a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">vars.h</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stp_array_t
-: <a class="el" href="group__array.html#ga0">array.h</a><li>stp_color_t
-: <a class="el" href="group__color.html#ga5">color.h</a><li>stp_compute_linewidth_func
-: <a class="el" href="weave_8h.html#a4">weave.h</a><li>stp_const_parameter_list_t
-: <a class="el" href="group__vars.html#ga2">vars.h</a><li>stp_copy_data_func_t
-: <a class="el" href="group__vars.html#ga4">vars.h</a><li>stp_curve_t
-: <a class="el" href="group__curve.html#ga0">curve.h</a><li>stp_dither_matrix_generic_t
-: <a class="el" href="dither_8h.html#a7">dither.h</a><li>stp_dither_matrix_impl_t
-: <a class="el" href="dither_8h.html#a8">dither.h</a><li>stp_dither_matrix_normal_t
-: <a class="el" href="dither_8h.html#a6">dither.h</a><li>stp_dither_matrix_short_t
-: <a class="el" href="dither_8h.html#a5">dither.h</a><li>stp_dotsize_t
-: <a class="el" href="dither_8h.html#a9">dither.h</a><li>stp_family_t
-: <a class="el" href="group__printer.html#ga1">printers.h</a><li>stp_fillfunc
-: <a class="el" href="weave_8h.html#a2">weave.h</a><li>stp_flushfunc
-: <a class="el" href="weave_8h.html#a3">weave.h</a><li>stp_free_data_func_t
-: <a class="el" href="group__vars.html#ga5">vars.h</a><li>stp_image_t
-: <a class="el" href="group__image.html#ga7">image.h</a><li>stp_list_item_t
-: <a class="el" href="group__list.html#ga0">list.h</a><li>stp_list_t
-: <a class="el" href="group__list.html#ga1">list.h</a><li>stp_module_t
-: <a class="el" href="module_8h.html#a1">module.h</a><li>stp_module_version_t
-: <a class="el" href="module_8h.html#a0">module.h</a><li>stp_mxml_attr_t
-: <a class="el" href="mxml_8h.html#a15">mxml.h</a><li>stp_mxml_element_t
-: <a class="el" href="mxml_8h.html#a16">mxml.h</a><li>stp_mxml_node_t
-: <a class="el" href="mxml_8h.html#a19">mxml.h</a><li>stp_mxml_text_t
-: <a class="el" href="mxml_8h.html#a17">mxml.h</a><li>stp_mxml_type_t
-: <a class="el" href="mxml_8h.html#a14">mxml.h</a><li>stp_mxml_value_t
-: <a class="el" href="mxml_8h.html#a18">mxml.h</a><li>stp_node_copyfunc
-: <a class="el" href="group__list.html#ga3">list.h</a><li>stp_node_freefunc
-: <a class="el" href="group__list.html#ga2">list.h</a><li>stp_node_namefunc
-: <a class="el" href="group__list.html#ga4">list.h</a><li>stp_node_sortfunc
-: <a class="el" href="group__list.html#ga5">list.h</a><li>stp_outfunc_t
-: <a class="el" href="group__vars.html#ga3">vars.h</a><li>stp_packfunc
-: <a class="el" href="weave_8h.html#a1">weave.h</a><li>stp_parameter_list_t
-: <a class="el" href="group__vars.html#ga1">vars.h</a><li>stp_printer_t
-: <a class="el" href="group__printer.html#ga0">printers.h</a><li>stp_sequence_t
-: <a class="el" href="group__sequence.html#ga0">sequence.h</a><li>stp_shade_t
-: <a class="el" href="dither_8h.html#a10">dither.h</a><li>stp_string_list_t
-: <a class="el" href="string-list_8h.html#a0">string-list.h</a><li>stp_vars_t
-: <a class="el" href="group__vars.html#ga0">vars.h</a><li>stp_xml_parse_func
-: <a class="el" href="xml_8h.html#a0">xml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">array.h</a><li>stp_color_t
+: <a class="el" href="group__color.html#gb711e2534c69bde47be7af3409c8ee2c">color.h</a><li>stp_compute_linewidth_func
+: <a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">weave.h</a><li>stp_const_parameter_list_t
+: <a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">vars.h</a><li>stp_copy_data_func_t
+: <a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">vars.h</a><li>stp_curve_t
+: <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">curve.h</a><li>stp_dither_matrix_generic_t
+: <a class="el" href="dither_8h.html#c81f99c36dbc48c619831897bac28224">dither.h</a><li>stp_dither_matrix_impl_t
+: <a class="el" href="dither_8h.html#613c628e788dbef089fa32243500cd54">dither.h</a><li>stp_dither_matrix_normal_t
+: <a class="el" href="dither_8h.html#a7bbfbb8dd05a8c05a5c37143adc129a">dither.h</a><li>stp_dither_matrix_short_t
+: <a class="el" href="dither_8h.html#373f2efaf250ca412b5447b8bd4e7f51">dither.h</a><li>stp_dotsize_t
+: <a class="el" href="dither_8h.html#0a4617ed6063c68c6c8675fb9e8e9d01">dither.h</a><li>stp_family_t
+: <a class="el" href="group__printer.html#g5c0458c3c1d19474e0245c47dac29e70">printers.h</a><li>stp_fillfunc
+: <a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">weave.h</a><li>stp_flushfunc
+: <a class="el" href="weave_8h.html#76c426b3b4c3b2503c54f2c2a013768a">weave.h</a><li>stp_free_data_func_t
+: <a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">vars.h</a><li>stp_image_t
+: <a class="el" href="group__image.html#gc5b6b70cd39959ffd06deab3724d87e9">image.h</a><li>stp_list_item_t
+: <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">list.h</a><li>stp_list_t
+: <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">list.h</a><li>stp_module_t
+: <a class="el" href="module_8h.html#1bc0723b8b43547b333980913ea42965">module.h</a><li>stp_module_version_t
+: <a class="el" href="module_8h.html#a6058b6828d19e60a3e6c86b242da863">module.h</a><li>stp_mxml_attr_t
+: <a class="el" href="mxml_8h.html#1ed814dbc1628ca237bed68e27043438">mxml.h</a><li>stp_mxml_element_t
+: <a class="el" href="mxml_8h.html#504a90f35ed408a7f80f6dbdadf45ae4">mxml.h</a><li>stp_mxml_node_t
+: <a class="el" href="mxml_8h.html#1d1a605dff310b7538b297c8e63b1d88">mxml.h</a><li>stp_mxml_text_t
+: <a class="el" href="mxml_8h.html#a2b9c7f1c79258abe63be05529b2a908">mxml.h</a><li>stp_mxml_type_t
+: <a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">mxml.h</a><li>stp_mxml_value_t
+: <a class="el" href="mxml_8h.html#d162e4b65493580e8bee75ef0c8c12b6">mxml.h</a><li>stp_node_copyfunc
+: <a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">list.h</a><li>stp_node_freefunc
+: <a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">list.h</a><li>stp_node_namefunc
+: <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">list.h</a><li>stp_node_sortfunc
+: <a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">list.h</a><li>stp_outfunc_t
+: <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">vars.h</a><li>stp_packfunc
+: <a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">weave.h</a><li>stp_parameter_list_t
+: <a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">vars.h</a><li>stp_printer_t
+: <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">printers.h</a><li>stp_sequence_t
+: <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">sequence.h</a><li>stp_shade_t
+: <a class="el" href="dither_8h.html#737b4edb8992127d0616e78f6c0a4c14">dither.h</a><li>stp_string_list_t
+: <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">string-list.h</a><li>stp_vars_t
+: <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">vars.h</a><li>stp_xml_parse_func
+: <a class="el" href="xml_8h.html#ec3dca5a8c562175532452b7a055200f">xml.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/globals_vars.html b/doc/gutenprint/html/globals_vars.html
index b4df722..1e673c7 100644
--- a/doc/gutenprint/html/globals_vars.html
+++ b/doc/gutenprint/html/globals_vars.html
@@ -2,28 +2,52 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li id="current"><a href="globals_vars.html"><span>Variables</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>stp_binary_age
-: <a class="el" href="group__version.html#ga4">gutenprint-version.h</a><li>stp_compute_tiff_linewidth
-: <a class="el" href="weave_8h.html#a9">weave.h</a><li>stp_compute_uncompressed_linewidth
-: <a class="el" href="weave_8h.html#a10">weave.h</a><li>stp_current_interface
-: <a class="el" href="group__version.html#ga3">gutenprint-version.h</a><li>stp_fill_tiff
-: <a class="el" href="weave_8h.html#a7">weave.h</a><li>stp_fill_uncompressed
-: <a class="el" href="weave_8h.html#a8">weave.h</a><li>stp_interface_age
-: <a class="el" href="group__version.html#ga5">gutenprint-version.h</a><li>stp_major_version
-: <a class="el" href="group__version.html#ga0">gutenprint-version.h</a><li>stp_micro_version
-: <a class="el" href="group__version.html#ga2">gutenprint-version.h</a><li>stp_minor_version
-: <a class="el" href="group__version.html#ga1">gutenprint-version.h</a><li>stp_pack_tiff
-: <a class="el" href="weave_8h.html#a5">weave.h</a><li>stp_pack_uncompressed
-: <a class="el" href="weave_8h.html#a6">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+: <a class="el" href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0">gutenprint-version.h</a><li>stp_compute_tiff_linewidth
+: <a class="el" href="weave_8h.html#a6df061ed81c1a6ecb8854b6eab4e276">weave.h</a><li>stp_compute_uncompressed_linewidth
+: <a class="el" href="weave_8h.html#f6c7a76f229fdc0be020a53a15a4a5f5">weave.h</a><li>stp_current_interface
+: <a class="el" href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc">gutenprint-version.h</a><li>stp_fill_tiff
+: <a class="el" href="weave_8h.html#6c47bead0399664b9041a6d5687b091e">weave.h</a><li>stp_fill_uncompressed
+: <a class="el" href="weave_8h.html#fb161f053574d9cd4a47b613b614b0f3">weave.h</a><li>stp_interface_age
+: <a class="el" href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac">gutenprint-version.h</a><li>stp_major_version
+: <a class="el" href="group__version.html#g19a4efe48689fb8f859d04e60bfe028f">gutenprint-version.h</a><li>stp_micro_version
+: <a class="el" href="group__version.html#g24960731fb86305c31f0be5621ccb993">gutenprint-version.h</a><li>stp_minor_version
+: <a class="el" href="group__version.html#g66def32167cee385762282e36b60d3b7">gutenprint-version.h</a><li>stp_pack_tiff
+: <a class="el" href="weave_8h.html#27cae2ded3a9434dd6f332dbf6721f71">weave.h</a><li>stp_pack_uncompressed
+: <a class="el" href="weave_8h.html#b81173e35f655b1a8f0047cbadce5391">weave.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__array.html b/doc/gutenprint/html/group__array.html
index 82bc28c..7bcf47f 100644
--- a/doc/gutenprint/html/group__array.html
+++ b/doc/gutenprint/html/group__array.html
@@ -2,62 +2,71 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: array</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>array</h1>The array is a simple "two-dimensional array of numbers" data structure.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga0">stp_array_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_array&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The array opaque data type.  <a href="#g69e0971771118ccea2a5dc72ba4fa73e"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga1">stp_array_create</a> (int x_size, int y_size)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66">stp_array_create</a> (int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga2">stp_array_destroy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new array.  <a href="#gaf63aaff6ea861e16b3addc023ef2e66"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g562ad19d8ecc1e9bdd8c182b0a05ecec">stp_array_destroy</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga3">stp_array_copy</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *dest, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an array.  <a href="#g562ad19d8ecc1e9bdd8c182b0a05ecec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gab9b031be229d8762faf46a3ef9454ec">stp_array_copy</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *dest, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga4">stp_array_create_copy</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an array.  <a href="#gab9b031be229d8762faf46a3ef9454ec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g19370f7d4779013904be75bc3d97e024">stp_array_create_copy</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga5">stp_array_set_size</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an array.  <a href="#g19370f7d4779013904be75bc3d97e024"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g698e51815f2ef3fd0709d6b32a2bb921">stp_array_set_size</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int x_size, int y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga6">stp_array_get_size</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resize an array.  <a href="#g698e51815f2ef3fd0709d6b32a2bb921"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g48e34b2673c2973884f0a403bafe7ea8">stp_array_get_size</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int *x_size, int *y_size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga7">stp_array_set_data</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the size of an array.  <a href="#g48e34b2673c2973884f0a403bafe7ea8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g0ca3891b4cde193cc65de63053e3f4fa">stp_array_set_data</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga8">stp_array_get_data</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in an array.  <a href="#g0ca3891b4cde193cc65de63053e3f4fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be">stp_array_get_data</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga9">stp_array_set_point</a> (<a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in an array.  <a href="#g9e1c46379b5935ed3a939833bd9e68be"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g4ab405205d678a3d9ae02a98103fbfea">stp_array_set_point</a> (<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int x, int y, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga10">stp_array_get_point</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in the array.  <a href="#g4ab405205d678a3d9ae02a98103fbfea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#gb9d53cf70f2c892dca82b8db2414fad2">stp_array_get_point</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array, int x, int y, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#ga11">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in the array.  <a href="#gb9d53cf70f2c892dca82b8db2414fad2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__array.html#g2051c3f4a1eaccb198744f8d7c76d649">stp_array_get_sequence</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#ga11"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t.  <a href="#g2051c3f4a1eaccb198744f8d7c76d649"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The array is a simple "two-dimensional array of numbers" data structure. 
 <p>
-array "inherits" from the sequence data structure (implemented via containment).<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="array.h::stp_array_t" ref="ga0" args="" --><p>
+array "inherits" from the sequence data structure (implemented via containment). <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g69e0971771118ccea2a5dc72ba4fa73e"></a><!-- doxytag: member="array.h::stp_array_t" ref="g69e0971771118ccea2a5dc72ba4fa73e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_array <a class="el" href="group__array.html#ga0">stp_array_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_array <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -77,7 +86,7 @@ The array opaque data type.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="array.h::stp_array_copy" ref="ga3" args="(stp_array_t *dest, const stp_array_t *source)" --><p>
+<a class="anchor" name="gab9b031be229d8762faf46a3ef9454ec"></a><!-- doxytag: member="array.h::stp_array_copy" ref="gab9b031be229d8762faf46a3ef9454ec" args="(stp_array_t *dest, const stp_array_t *source)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -85,13 +94,13 @@ The array opaque data type.
         <tr>
           <td class="md" nowrap valign="top">void stp_array_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>dest</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -113,22 +122,22 @@ The array opaque data type.
 <p>
 Copy an array. 
 <p>
-Both dest and source must be valid arrays previously created with <a class="el" href="group__array.html#ga1">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid arrays previously created with <a class="el" href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination array. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source array.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source array. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="array.h::stp_array_create" ref="ga1" args="(int x_size, int y_size)" --><p>
+<a class="anchor" name="gaf63aaff6ea861e16b3addc023ef2e66"></a><!-- doxytag: member="array.h::stp_array_create" ref="gaf63aaff6ea861e16b3addc023ef2e66" args="(int x_size, int y_size)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_array_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_array_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">int&nbsp;</td>
           <td class="mdname" nowrap> <em>x_size</em>, </td>
@@ -164,19 +173,19 @@ The total size of the array will be (x_size * y_size). <dl compact><dt><b>Parame
     <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>the number of "rows". </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created array.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created array. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="ga4" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="g19370f7d4779013904be75bc3d97e024"></a><!-- doxytag: member="array.h::stp_array_create_copy" ref="g19370f7d4779013904be75bc3d97e024" args="(const stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_array_create_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_array_create_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -195,16 +204,16 @@ The total size of the array will be (x_size * y_size). <dl compact><dt><b>Parame
 <p>
 Copy and allocate an array. 
 <p>
-dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__array.html#ga1">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__array.html#gaf63aaff6ea861e16b3addc023ef2e66">stp_array_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the source array. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the array.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the array. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="ga2" args="(stp_array_t *array)" --><p>
+<a class="anchor" name="g562ad19d8ecc1e9bdd8c182b0a05ecec"></a><!-- doxytag: member="array.h::stp_array_destroy" ref="g562ad19d8ecc1e9bdd8c182b0a05ecec" args="(stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -212,7 +221,7 @@ dest will be created, and then the contents of source will be copied into it. de
         <tr>
           <td class="md" nowrap valign="top">void stp_array_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -233,13 +242,13 @@ Destroy an array.
 <p>
 It is an error to destroy the array more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to destroy. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="array.h::stp_array_get_data" ref="ga8" args="(const stp_array_t *array, size_t *size, const double **data)" --><p>
+<a class="anchor" name="g9e1c46379b5935ed3a939833bd9e68be"></a><!-- doxytag: member="array.h::stp_array_get_data" ref="g9e1c46379b5935ed3a939833bd9e68be" args="(const stp_array_t *array, size_t *size, const double **data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -247,7 +256,7 @@ It is an error to destroy the array more than once. <dl compact><dt><b>Parameter
         <tr>
           <td class="md" nowrap valign="top">void stp_array_get_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -285,17 +294,17 @@ Get the data in an array.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to get the data from. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>size</em>&nbsp;</td><td>the number of elements in the array (x_size * y_size) are stored in the size_t pointed to. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an array of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__array.html#ga0">stp_array_t</a> *array;
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an array of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array;
  size_t size;
  <span class="keywordtype">double</span> *data;
- <a class="code" href="group__array.html#ga8">stp_array_get_data</a>(array, &amp;size, &amp;data);
-</pre></div></td></tr>
+ <a class="code" href="group__array.html#g9e1c46379b5935ed3a939833bd9e68be">stp_array_get_data</a>(array, &amp;size, &amp;data);
+</pre></div> </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="array.h::stp_array_get_point" ref="ga10" args="(const stp_array_t *array, int x, int y, double *data)" --><p>
+<a class="anchor" name="gb9d53cf70f2c892dca82b8db2414fad2"></a><!-- doxytag: member="array.h::stp_array_get_point" ref="gb9d53cf70f2c892dca82b8db2414fad2" args="(const stp_array_t *array, int x, int y, double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -303,7 +312,7 @@ Get the data in an array.
         <tr>
           <td class="md" nowrap valign="top">int stp_array_get_point           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -351,19 +360,19 @@ Get the data at a single point in the array.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum is stored in the double pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="ga11" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="g2051c3f4a1eaccb198744f8d7c76d649"></a><!-- doxytag: member="array.h::stp_array_get_sequence" ref="g2051c3f4a1eaccb198744f8d7c76d649" args="(const stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_array_get_sequence           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_array_get_sequence           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -387,11 +396,11 @@ Get the underlying stp_sequence_t.
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the (constant) stp_sequence_t.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the (constant) stp_sequence_t. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="array.h::stp_array_get_size" ref="ga6" args="(const stp_array_t *array, int *x_size, int *y_size)" --><p>
+<a class="anchor" name="g48e34b2673c2973884f0a403bafe7ea8"></a><!-- doxytag: member="array.h::stp_array_get_size" ref="g48e34b2673c2973884f0a403bafe7ea8" args="(const stp_array_t *array, int *x_size, int *y_size)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -399,7 +408,7 @@ Get the underlying stp_sequence_t.
         <tr>
           <td class="md" nowrap valign="top">void stp_array_get_size           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -437,13 +446,13 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to get the size of. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>x_size</em>&nbsp;</td><td>a pointer to an integer to store the x size in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>a pointer to an integer to store the y size in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>a pointer to an integer to store the y size in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="array.h::stp_array_set_data" ref="ga7" args="(stp_array_t *array, const double *data)" --><p>
+<a class="anchor" name="g0ca3891b4cde193cc65de63053e3f4fa"></a><!-- doxytag: member="array.h::stp_array_set_data" ref="g0ca3891b4cde193cc65de63053e3f4fa" args="(stp_array_t *array, const double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -451,7 +460,7 @@ The current x and y sizes are stored in the integers pointed to by x_size and y_
         <tr>
           <td class="md" nowrap valign="top">void stp_array_set_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -482,13 +491,13 @@ Set the data in an array.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of an array containing the data to set. This array must be at least as long as (x_size * y_size). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="array.h::stp_array_set_point" ref="ga9" args="(stp_array_t *array, int x, int y, double data)" --><p>
+<a class="anchor" name="g4ab405205d678a3d9ae02a98103fbfea"></a><!-- doxytag: member="array.h::stp_array_set_point" ref="g4ab405205d678a3d9ae02a98103fbfea" args="(stp_array_t *array, int x, int y, double data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -496,7 +505,7 @@ Set the data in an array.
         <tr>
           <td class="md" nowrap valign="top">int stp_array_set_point           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -544,11 +553,11 @@ Set the data at a single point in the array.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="array.h::stp_array_set_size" ref="ga5" args="(stp_array_t *array, int x_size, int y_size)" --><p>
+<a class="anchor" name="g698e51815f2ef3fd0709d6b32a2bb921"></a><!-- doxytag: member="array.h::stp_array_set_size" ref="g698e51815f2ef3fd0709d6b32a2bb921" args="(stp_array_t *array, int x_size, int y_size)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -556,7 +565,7 @@ Set the data at a single point in the array.
         <tr>
           <td class="md" nowrap valign="top">void stp_array_set_size           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>array</em>, </td>
         </tr>
         <tr>
@@ -594,14 +603,14 @@ Resizing an array will destroy all data stored in the array. <dl compact><dt><b>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>array</em>&nbsp;</td><td>the array to resize. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>x_size</em>&nbsp;</td><td>the new number of "columns". </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>the new number of "rows".</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>y_size</em>&nbsp;</td><td>the new number of "rows". </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__color.html b/doc/gutenprint/html/group__color.html
index 053e088..66aa11e 100644
--- a/doc/gutenprint/html/group__color.html
+++ b/doc/gutenprint/html/group__color.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: color</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>color</h1>The color data type is responsible for providing colour conversion features.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -14,55 +23,44 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html">stp_color</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5">stp_color_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__color.html">stp_color</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gb711e2534c69bde47be7af3409c8ee2c">stp_color_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga6">stp_color_init</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g835bd7024477347a46ea0c14b46996c6">stp_color_init</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga7">stp_color_get_row</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gadf861820b3956ef7b18600dbf5da9da">stp_color_get_row</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga8">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ge2e397268288111eaffd352cb0ff1b98">stp_color_list_parameters</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga9">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#gc47fecc2c32115494ea364e53d9f1ff2">stp_color_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga10">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ge3543409e331c5d1756c2c8fe927343b">stp_color_register</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga11">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g3e0f2728d47e1701c00b06199bc5512d">stp_color_unregister</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga12">stp_color_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga8b8b19da7bcc9bc814fe0f97f39b3ed">stp_color_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga13">stp_get_color_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available color modules.  <a href="#ga8b8b19da7bcc9bc814fe0f97f39b3ed"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g25d9ee3ceee6d6e9964007ad12f9900b">stp_get_color_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga14">stp_get_color_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its name.  <a href="#g25d9ee3ceee6d6e9964007ad12f9900b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga5ddc4c9d02576154d0b2c6c64a6a033">stp_get_color_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga15">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a color module by its index number.  <a href="#ga5ddc4c9d02576154d0b2c6c64a6a033"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__color.html">stp_color_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga92373d7aa315ab6e32a1bb0ac944b79">stp_get_color_by_colorfuncs</a> (<a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *colorfuncs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga16">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#g36d2d72d2cd967405a978b76a7a8c992">stp_color_get_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga17">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#ga17"></a><br></td></tr>
-<tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0">stp_colorfuncs_t::get_row</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga1">stp_colorfuncs_t::list_parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2">stp_colorfuncs_t::describe_parameter</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3">stp_color::long_name</a></td></tr>
-
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga4">stp_color::colorfuncs</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the short (untranslated) name of a color module.  <a href="#g36d2d72d2cd967405a978b76a7a8c992"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0559d7812bdcbebe4edc14fc05274d9">stp_color_get_long_name</a> (const <a class="el" href="structstp__color.html">stp_color_t</a> *c)</td></tr>
 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the long (translated) name of a color module.  <a href="#ga0559d7812bdcbebe4edc14fc05274d9"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The color data type is responsible for providing colour conversion features. 
 <p>
-Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles).<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="color.h::stp_color_t" ref="ga5" args="" --><p>
+Color modules provide the actual functionality, so different colour management modules may provide the application with different services (for example, colour profiles). <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="gb711e2534c69bde47be7af3409c8ee2c"></a><!-- doxytag: member="color.h::stp_color_t" ref="gb711e2534c69bde47be7af3409c8ee2c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -86,7 +84,7 @@ Color modules provide the actual functionality, so different colour management m
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="color.h::stp_color_count" ref="ga12" args="(void)" --><p>
+<a class="anchor" name="ga8b8b19da7bcc9bc814fe0f97f39b3ed"></a><!-- doxytag: member="color.h::stp_color_count" ref="ga8b8b19da7bcc9bc814fe0f97f39b3ed" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -113,11 +111,11 @@ Color modules provide the actual functionality, so different colour management m
 <p>
 Get the number of available color modules. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of color modules.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the number of color modules. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="color.h::stp_color_describe_parameter" ref="ga9" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
+<a class="anchor" name="gc47fecc2c32115494ea364e53d9f1ff2"></a><!-- doxytag: member="color.h::stp_color_describe_parameter" ref="gc47fecc2c32115494ea364e53d9f1ff2" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -125,7 +123,7 @@ Get the number of available color modules.
         <tr>
           <td class="md" nowrap valign="top">void stp_color_describe_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -160,7 +158,7 @@ Get the number of available color modules.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="ga17" args="(const stp_color_t *c)" --><p>
+<a class="anchor" name="ga0559d7812bdcbebe4edc14fc05274d9"></a><!-- doxytag: member="color.h::stp_color_get_long_name" ref="ga0559d7812bdcbebe4edc14fc05274d9" args="(const stp_color_t *c)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -192,11 +190,11 @@ Get the long (translated) name of a color module.
     <tr><td valign="top"></td><td valign="top"><em>c</em>&nbsp;</td><td>the color module to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the long name.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the long name. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="ga16" args="(const stp_color_t *c)" --><p>
+<a class="anchor" name="g36d2d72d2cd967405a978b76a7a8c992"></a><!-- doxytag: member="color.h::stp_color_get_name" ref="g36d2d72d2cd967405a978b76a7a8c992" args="(const stp_color_t *c)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -228,11 +226,11 @@ Get the short (untranslated) name of a color module.
     <tr><td valign="top"></td><td valign="top"><em>c</em>&nbsp;</td><td>the color module to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the short name.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the short name. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="color.h::stp_color_get_row" ref="ga7" args="(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" --><p>
+<a class="anchor" name="gadf861820b3956ef7b18600dbf5da9da"></a><!-- doxytag: member="color.h::stp_color_get_row" ref="gadf861820b3956ef7b18600dbf5da9da" args="(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -240,7 +238,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="md" nowrap valign="top">int stp_color_get_row           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -281,7 +279,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="color.h::stp_color_init" ref="ga6" args="(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
+<a class="anchor" name="g835bd7024477347a46ea0c14b46996c6"></a><!-- doxytag: member="color.h::stp_color_init" ref="g835bd7024477347a46ea0c14b46996c6" args="(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -289,7 +287,7 @@ Get the short (untranslated) name of a color module.
         <tr>
           <td class="md" nowrap valign="top">int stp_color_init           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -324,15 +322,15 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="ga8" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ge2e397268288111eaffd352cb0ff1b98"></a><!-- doxytag: member="color.h::stp_color_list_parameters" ref="ge2e397268288111eaffd352cb0ff1b98" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_color_list_parameters           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_color_list_parameters           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -352,7 +350,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="color.h::stp_color_register" ref="ga10" args="(const stp_color_t *color)" --><p>
+<a class="anchor" name="ge3543409e331c5d1756c2c8fe927343b"></a><!-- doxytag: member="color.h::stp_color_register" ref="ge3543409e331c5d1756c2c8fe927343b" args="(const stp_color_t *color)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -380,7 +378,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="ga11" args="(const stp_color_t *color)" --><p>
+<a class="anchor" name="g3e0f2728d47e1701c00b06199bc5512d"></a><!-- doxytag: member="color.h::stp_color_unregister" ref="g3e0f2728d47e1701c00b06199bc5512d" args="(const stp_color_t *color)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -408,7 +406,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="ga15" args="(stp_colorfuncs_t *colorfuncs)" --><p>
+<a class="anchor" name="ga92373d7aa315ab6e32a1bb0ac944b79"></a><!-- doxytag: member="color.h::stp_get_color_by_colorfuncs" ref="ga92373d7aa315ab6e32a1bb0ac944b79" args="(stp_colorfuncs_t *colorfuncs)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -436,7 +434,7 @@ Get the short (untranslated) name of a color module.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="ga14" args="(int idx)" --><p>
+<a class="anchor" name="ga5ddc4c9d02576154d0b2c6c64a6a033"></a><!-- doxytag: member="color.h::stp_get_color_by_index" ref="ga5ddc4c9d02576154d0b2c6c64a6a033" args="(int idx)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -468,11 +466,11 @@ Get a color module by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="ga13" args="(const char *name)" --><p>
+<a class="anchor" name="g25d9ee3ceee6d6e9964007ad12f9900b"></a><!-- doxytag: member="color.h::stp_get_color_by_name" ref="g25d9ee3ceee6d6e9964007ad12f9900b" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -504,128 +502,12 @@ Get a color module by its name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the short unique name. number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure.</dd></dl>
-    </td>
-  </tr>
-</table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="stp_color::colorfuncs" ref="ga4" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="group__color.html#ga4">stp_color::colorfuncs</a><code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="stp_colorfuncs_t::describe_parameter" ref="ga2" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="group__color.html#ga2">stp_colorfuncs_t::describe_parameter</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="stp_colorfuncs_t::get_row" ref="ga0" args=")(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="group__color.html#ga0">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="stp_colorfuncs_t::list_parameters" ref="ga1" args=")(const stp_vars_t *v)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(* <a class="el" href="group__color.html#ga1">stp_colorfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="stp_color::long_name" ref="ga3" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="group__color.html#ga3">stp_color::long_name</a><code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the color module, or NULL on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__curve.html b/doc/gutenprint/html/group__curve.html
index 0a932df..e9d3ecd 100644
--- a/doc/gutenprint/html/group__curve.html
+++ b/doc/gutenprint/html/group__curve.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: curve</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>curve</h1>The curve type models a linear, spline or gamma curve.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -13,182 +22,182 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Point (x,y) for piecewise curve.  <a href="structstp__curve__point__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga0">stp_curve_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_curve&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The curve opaque data type.  <a href="#gd5ce135b7af2c6e79bae493c7055461d"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gga47a1">STP_CURVE_TYPE_LINEAR</a>, 
-<a class="el" href="group__curve.html#gga47a2">STP_CURVE_TYPE_SPLINE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a> { <a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff">STP_CURVE_TYPE_LINEAR</a>, 
+<a class="el" href="group__curve.html#gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4">STP_CURVE_TYPE_SPLINE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#ga47">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gga48a3">STP_CURVE_WRAP_NONE</a>, 
-<a class="el" href="group__curve.html#gga48a4">STP_CURVE_WRAP_AROUND</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Curve types.  <a href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a> { <a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85">STP_CURVE_WRAP_NONE</a>, 
+<a class="el" href="group__curve.html#gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2">STP_CURVE_WRAP_AROUND</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#ga48">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#gga49a5">STP_CURVE_COMPOSE_ADD</a>, 
-<a class="el" href="group__curve.html#gga49a6">STP_CURVE_COMPOSE_MULTIPLY</a>, 
-<a class="el" href="group__curve.html#gga49a7">STP_CURVE_COMPOSE_EXPONENTIATE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Wrapping mode.  <a href="group__curve.html#g1880ff988f772337e8892e791951337b">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> { <a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d">STP_CURVE_COMPOSE_ADD</a>, 
+<a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011">STP_CURVE_COMPOSE_MULTIPLY</a>, 
+<a class="el" href="group__curve.html#ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701">STP_CURVE_COMPOSE_EXPONENTIATE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#ga49">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#gga50a8">STP_CURVE_BOUNDS_RESCALE</a>, 
-<a class="el" href="group__curve.html#gga50a9">STP_CURVE_BOUNDS_CLIP</a>, 
-<a class="el" href="group__curve.html#gga50a10">STP_CURVE_BOUNDS_ERROR</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Composition types.  <a href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a> { <a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09">STP_CURVE_BOUNDS_RESCALE</a>, 
+<a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41">STP_CURVE_BOUNDS_CLIP</a>, 
+<a class="el" href="group__curve.html#ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a">STP_CURVE_BOUNDS_ERROR</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#ga50">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Behaviour when curve exceeds bounds.  <a href="group__curve.html#gd2b61113497bb142943d5131df3286ae">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga1">stp_curve_create</a> (<a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> wrap)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6">stp_curve_create</a> (<a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a> wrap)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga2">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new curve.  <a href="#gf6b71d25c497e99ab2c073108b080ab6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ge76787e84f2fc3ba299de94f4ecc6d82">stp_curve_create_copy</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga3">stp_curve_copy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an curve.  <a href="#ge76787e84f2fc3ba299de94f4ecc6d82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gfdafb0a802f00063b00713dbd6d6bfc0">stp_curve_copy</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *dest, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga4">stp_curve_destroy</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an curve.  <a href="#gfdafb0a802f00063b00713dbd6d6bfc0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g01bf94ed6a523f28dd909be054a69790">stp_curve_destroy</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga5">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy an curve.  <a href="#g01bf94ed6a523f28dd909be054a69790"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g5283a18fcc5db8e9f9384d54de50ba83">stp_curve_set_bounds</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga6">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds on a curve.  <a href="#g5283a18fcc5db8e9f9384d54de50ba83"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g4d32e3000dd3a8f258b2eab94797731b">stp_curve_get_bounds</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga7">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds on a curve.  <a href="#g4d32e3000dd3a8f258b2eab94797731b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd2aade6a22b516006ce0f897c5027f35">stp_curve_get_wrap</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga8">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the wrapping mode.  <a href="#gd2aade6a22b516006ce0f897c5027f35"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gdda4313c874170e0086d2000ed04c02f">stp_curve_is_piecewise</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga9">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Determine whether the curve is piecewise.  <a href="#gdda4313c874170e0086d2000ed04c02f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf8bad025ea7463067c9d7ab205af062">stp_curve_get_range</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double *low, double *high)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga10">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g48d9023f28ae2d15975002f7a9d7f94e">stp_curve_count_points</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga11">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> itype)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of allocated points in the curve.  <a href="#g48d9023f28ae2d15975002f7a9d7f94e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3175711d943e95fdf363d5124237a56e">stp_curve_set_interpolation_type</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, <a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a> itype)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga12">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the curve interpolation type.  <a href="#g3175711d943e95fdf363d5124237a56e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gca245aa6907c2fb95e150ce9a86ddb1a">stp_curve_get_interpolation_type</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga13">stp_curve_set_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the curve interpolation type.  <a href="#gca245aa6907c2fb95e150ce9a86ddb1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gba540befdbd82e705358b2175d5b92e8">stp_curve_set_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga14">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#gba540befdbd82e705358b2175d5b92e8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gcbd01a2662edb48af0816930b40dc8ab">stp_curve_set_data_points</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga15">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set all data points of the curve.  <a href="#gcbd01a2662edb48af0816930b40dc8ab"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gc0401bfefa3990ca26a0fb7718f1ebb2">stp_curve_set_float_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga16">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from float values.  <a href="#gc0401bfefa3990ca26a0fb7718f1ebb2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gaf770dcae26ce48d5ee50dd8217e2c14">stp_curve_set_long_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga17">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from long values.  <a href="#gaf770dcae26ce48d5ee50dd8217e2c14"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g184e0e32892aae4b2c195c6fc880bace">stp_curve_set_ulong_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga18">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned long values.  <a href="#g184e0e32892aae4b2c195c6fc880bace"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gbc9ae004e972c7d638336714f3112f9b">stp_curve_set_int_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga19">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from integer values.  <a href="#gbc9ae004e972c7d638336714f3112f9b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g8a215d4981a74fb2b6e4a0c381314df0">stp_curve_set_uint_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga20">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned integer values.  <a href="#g8a215d4981a74fb2b6e4a0c381314df0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd23dcc9abefca9a98b3ecd9714227093">stp_curve_set_short_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga21">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from short values.  <a href="#gd23dcc9abefca9a98b3ecd9714227093"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g4051de3e6be42f4499de78af67288616">stp_curve_set_ushort_data</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga22">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data points in a curve from unsigned short values.  <a href="#g4051de3e6be42f4499de78af67288616"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd4cfbfbfe0c16b8f2ef4d8c44d221172">stp_curve_get_subrange</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t start, size_t count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga23">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *range, size_t start)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve containing a subrange of data.  <a href="#gd4cfbfbfe0c16b8f2ef4d8c44d221172"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0ba6753a8beeaca19719d047da25ecb5">stp_curve_set_subrange</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *range, size_t start)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga24">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g24b9486c45d68983e94dcc0fb19edacd">stp_curve_get_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga25">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data.  <a href="#g24b9486c45d68983e94dcc0fb19edacd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd30e41654f1e0217aae3389b30cdffba">stp_curve_get_data_points</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga26">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a pointer to the curve's raw data as points.  <a href="#gd30e41654f1e0217aae3389b30cdffba"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf363a0f9686bcd6521671d531bc522d5">stp_curve_get_float_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga27">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as floats.  <a href="#gf363a0f9686bcd6521671d531bc522d5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g187af251d5a89853545c8be898a00cc1">stp_curve_get_long_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga28">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as longs.  <a href="#g187af251d5a89853545c8be898a00cc1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g3ecbc0ce98e7bd7695002306f5a2ba1b">stp_curve_get_ulong_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga29">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned longs.  <a href="#g3ecbc0ce98e7bd7695002306f5a2ba1b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g01bda0b947a6075d4a1ed373865744e6">stp_curve_get_int_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga30">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as integers.  <a href="#g01bda0b947a6075d4a1ed373865744e6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb874365285383f3eb35c1a32496a69b4">stp_curve_get_uint_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga31">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned integers.  <a href="#gb874365285383f3eb35c1a32496a69b4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g60767bb2143fe4d491d351a4c0abc3b1">stp_curve_get_short_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga32">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as shorts.  <a href="#g60767bb2143fe4d491d351a4c0abc3b1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gb2312169172ec9789af9fd38279b3273">stp_curve_get_ushort_data</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga33">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get pointer to the curve's raw data as unsigned shorts.  <a href="#gb2312169172ec9789af9fd38279b3273"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gee3cc69ab758b400838014df4742c28e">stp_curve_get_sequence</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga34">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double f_gamma)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the underlying stp_sequence_t data structure which stp_curve_t is derived from.  <a href="#gee3cc69ab758b400838014df4742c28e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6548b7ca6ef6ab94fe1d927c246e7baf">stp_curve_set_gamma</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double f_gamma)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga35">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the gamma of a curve.  <a href="#g6548b7ca6ef6ab94fe1d927c246e7baf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gc9786b35c2b1a55d54b62bcc57481c82">stp_curve_get_gamma</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga36">stp_curve_set_point</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the gamma value of the curve.  <a href="#gc9786b35c2b1a55d54b62bcc57481c82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g9a05eae4f274f420418539cceb627556">stp_curve_set_point</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga37">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a point along the curve.  <a href="#g9a05eae4f274f420418539cceb627556"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf9ff6f55ec0a0615608dc1baec6aff00">stp_curve_get_point</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga38">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double where, double *result)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a point along the curve.  <a href="#gf9ff6f55ec0a0615608dc1baec6aff00"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g0fdfc2b27a8a464584589ef38a8e05c4">stp_curve_interpolate_value</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double where, double *result)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga39">stp_curve_resample</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, size_t points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Interpolate a point along the curve.  <a href="#g0fdfc2b27a8a464584589ef38a8e05c4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gf68cf2508ff4a14a0dbee6fc0001667e">stp_curve_resample</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, size_t points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga40">stp_curve_rescale</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a> bounds_mode)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Resample a curve (change the number of points).  <a href="#gf68cf2508ff4a14a0dbee6fc0001667e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#gd440d8d448173adc2be6737963a6e999">stp_curve_rescale</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve, double scale, <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> mode, <a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a> bounds_mode)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga41">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Rescale a curve (multiply all points by a scaling constant).  <a href="#gd440d8d448173adc2be6737963a6e999"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6ef71ce7d92e659b1c902df29b1dcbc7">stp_curve_write</a> (FILE *file, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga42">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a file.  <a href="#g6ef71ce7d92e659b1c902df29b1dcbc7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g21aa4497c58ebbb703dc3549560f084d">stp_curve_write_string</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga43">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Write a curve to a string.  <a href="#g21aa4497c58ebbb703dc3549560f084d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g650e49e1250dab5d9221ad747a627fc0">stp_curve_create_from_stream</a> (FILE *fp)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga44">stp_curve_create_from_file</a> (const char *file)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#g650e49e1250dab5d9221ad747a627fc0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g6ff03fcc2a47f297c48b683884e81924">stp_curve_create_from_file</a> (const char *file)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga45">stp_curve_create_from_string</a> (const char *string)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a stream.  <a href="#g6ff03fcc2a47f297c48b683884e81924"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g60dce8c741a9b6fde73ced2134305298">stp_curve_create_from_string</a> (const char *string)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#ga46">stp_curve_compose</a> (<a class="el" href="group__curve.html#ga0">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *a, <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *b, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> mode, int points)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a curve from a string.  <a href="#g60dce8c741a9b6fde73ced2134305298"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__curve.html#g657e0ad5b93f090220d35be615fec5e4">stp_curve_compose</a> (<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> **retval, <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *a, <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *b, <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> mode, int points)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="#ga46"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Compose two curves, creating a third curve.  <a href="#g657e0ad5b93f090220d35be615fec5e4"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The curve type models a linear, spline or gamma curve. 
 <p>
 curve "inherits" from the sequence data structure (implemented via containment), since the curve data is represented internally as a sequence of numbers, for linear and spline curves. Linear Piecewise Curves (LPCs) should be implemented in the future which represent a curve in a more compact format.<p>
-Various operations are supported, including interpolation and composition.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="curve.h::stp_curve_t" ref="ga0" args="" --><p>
+Various operations are supported, including interpolation and composition. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="gd5ce135b7af2c6e79bae493c7055461d"></a><!-- doxytag: member="curve.h::stp_curve_t" ref="gd5ce135b7af2c6e79bae493c7055461d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_curve <a class="el" href="group__curve.html#ga0">stp_curve_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_curve <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -208,13 +217,13 @@ The curve opaque data type.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga50"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="ga50" args="" --><p>
+<a class="anchor" name="gd2b61113497bb142943d5131df3286ae"></a><!-- doxytag: member="curve.h::stp_curve_bounds_t" ref="gd2b61113497bb142943d5131df3286ae" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -232,24 +241,24 @@ Behaviour when curve exceeds bounds.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga50a8"></a><!-- doxytag: member="STP_CURVE_BOUNDS_RESCALE" ref="gga50a8" args="" -->STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09"></a><!-- doxytag: member="STP_CURVE_BOUNDS_RESCALE" ref="ggd2b61113497bb142943d5131df3286ae96de530097381388d0d1a1d8e62f8d09" args="" -->STP_CURVE_BOUNDS_RESCALE</em>&nbsp;</td><td>
 Rescale the bounds. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga50a9"></a><!-- doxytag: member="STP_CURVE_BOUNDS_CLIP" ref="gga50a9" args="" -->STP_CURVE_BOUNDS_CLIP</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41"></a><!-- doxytag: member="STP_CURVE_BOUNDS_CLIP" ref="ggd2b61113497bb142943d5131df3286aec99c3e8da3f7113944f048a95937ab41" args="" -->STP_CURVE_BOUNDS_CLIP</em>&nbsp;</td><td>
 Clip the curve to the existing bounds. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga50a10"></a><!-- doxytag: member="STP_CURVE_BOUNDS_ERROR" ref="gga50a10" args="" -->STP_CURVE_BOUNDS_ERROR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a"></a><!-- doxytag: member="STP_CURVE_BOUNDS_ERROR" ref="ggd2b61113497bb142943d5131df3286aebe0e432634a0a010e283d8ad3195326a" args="" -->STP_CURVE_BOUNDS_ERROR</em>&nbsp;</td><td>
 Error if bounds are violated. </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga49"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="ga49" args="" --><p>
+<a class="anchor" name="gb7d718baf4619b6be6c4aff8ce84aad9"></a><!-- doxytag: member="curve.h::stp_curve_compose_t" ref="gb7d718baf4619b6be6c4aff8ce84aad9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -267,24 +276,24 @@ Composition types.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga49a5"></a><!-- doxytag: member="STP_CURVE_COMPOSE_ADD" ref="gga49a5" args="" -->STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d"></a><!-- doxytag: member="STP_CURVE_COMPOSE_ADD" ref="ggb7d718baf4619b6be6c4aff8ce84aad9869359ab77ef23f45cd3a9292236ee7d" args="" -->STP_CURVE_COMPOSE_ADD</em>&nbsp;</td><td>
 Add composition. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga49a6"></a><!-- doxytag: member="STP_CURVE_COMPOSE_MULTIPLY" ref="gga49a6" args="" -->STP_CURVE_COMPOSE_MULTIPLY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011"></a><!-- doxytag: member="STP_CURVE_COMPOSE_MULTIPLY" ref="ggb7d718baf4619b6be6c4aff8ce84aad93dcb330422ccb68ef880214ae36b1011" args="" -->STP_CURVE_COMPOSE_MULTIPLY</em>&nbsp;</td><td>
 Multiply composition. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga49a7"></a><!-- doxytag: member="STP_CURVE_COMPOSE_EXPONENTIATE" ref="gga49a7" args="" -->STP_CURVE_COMPOSE_EXPONENTIATE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701"></a><!-- doxytag: member="STP_CURVE_COMPOSE_EXPONENTIATE" ref="ggb7d718baf4619b6be6c4aff8ce84aad986cf4a614cfe39f6e296c26af0879701" args="" -->STP_CURVE_COMPOSE_EXPONENTIATE</em>&nbsp;</td><td>
 Exponentiate composition. </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga47"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="ga47" args="" --><p>
+<a class="anchor" name="g7ced905b29f0d85de94258dceb01c3f4"></a><!-- doxytag: member="curve.h::stp_curve_type_t" ref="g7ced905b29f0d85de94258dceb01c3f4" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -302,22 +311,22 @@ Curve types.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga47a1"></a><!-- doxytag: member="STP_CURVE_TYPE_LINEAR" ref="gga47a1" args="" -->STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff"></a><!-- doxytag: member="STP_CURVE_TYPE_LINEAR" ref="gg7ced905b29f0d85de94258dceb01c3f45f58d2d7c7c4706bd3ce9b5cb4d2d6ff" args="" -->STP_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
 Linear interpolation. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga47a2"></a><!-- doxytag: member="STP_CURVE_TYPE_SPLINE" ref="gga47a2" args="" -->STP_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4"></a><!-- doxytag: member="STP_CURVE_TYPE_SPLINE" ref="gg7ced905b29f0d85de94258dceb01c3f41966d7d77f4e8f4768f1008482d5e5e4" args="" -->STP_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
 Spline interpolation. </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga48"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="ga48" args="" --><p>
+<a class="anchor" name="g1880ff988f772337e8892e791951337b"></a><!-- doxytag: member="curve.h::stp_curve_wrap_mode_t" ref="g1880ff988f772337e8892e791951337b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -335,9 +344,9 @@ Wrapping mode.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga48a3"></a><!-- doxytag: member="STP_CURVE_WRAP_NONE" ref="gga48a3" args="" -->STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85"></a><!-- doxytag: member="STP_CURVE_WRAP_NONE" ref="gg1880ff988f772337e8892e791951337bd3712a1731cd9df06c776e5b7244dc85" args="" -->STP_CURVE_WRAP_NONE</em>&nbsp;</td><td>
 The curve does not wrap. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga48a4"></a><!-- doxytag: member="STP_CURVE_WRAP_AROUND" ref="gga48a4" args="" -->STP_CURVE_WRAP_AROUND</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2"></a><!-- doxytag: member="STP_CURVE_WRAP_AROUND" ref="gg1880ff988f772337e8892e791951337b44a58306f9aa6940a779d63b9ef6a0d2" args="" -->STP_CURVE_WRAP_AROUND</em>&nbsp;</td><td>
 The curve wraps to its starting point. </td></tr>
 </table>
 </dl>
@@ -345,7 +354,7 @@ The curve wraps to its starting point. </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga46"></a><!-- doxytag: member="curve.h::stp_curve_compose" ref="ga46" args="(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)" --><p>
+<a class="anchor" name="g657e0ad5b93f090220d35be615fec5e4"></a><!-- doxytag: member="curve.h::stp_curve_compose" ref="g657e0ad5b93f090220d35be615fec5e4" args="(stp_curve_t **retval, stp_curve_t *a, stp_curve_t *b, stp_curve_compose_t mode, int points)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -353,25 +362,25 @@ The curve wraps to its starting point. </td></tr>
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_compose           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> **&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> **&nbsp;</td>
           <td class="mdname" nowrap> <em>retval</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>a</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>b</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>mode</em>, </td>
         </tr>
         <tr>
@@ -408,11 +417,11 @@ Only add and multiply composition is currently supported. If both curves are gam
     <tr><td valign="top"></td><td valign="top"><em>points</em>&nbsp;</td><td>the number of points in the output curve (must not exceed 1048576). It must be at least two, unless the curve is a gamma curve and the operation chosen is multiplication or division. If -1, the resulting number of points will be the least common multiplier of the number of points in the input and output curves (but will not exceed 1048576). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if element-wise composition fails.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if element-wise composition fails. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="curve.h::stp_curve_copy" ref="ga3" args="(stp_curve_t *dest, const stp_curve_t *source)" --><p>
+<a class="anchor" name="gfdafb0a802f00063b00713dbd6d6bfc0"></a><!-- doxytag: member="curve.h::stp_curve_copy" ref="gfdafb0a802f00063b00713dbd6d6bfc0" args="(stp_curve_t *dest, const stp_curve_t *source)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -420,13 +429,13 @@ Only add and multiply composition is currently supported. If both curves are gam
         <tr>
           <td class="md" nowrap valign="top">void stp_curve_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>dest</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -448,16 +457,16 @@ Only add and multiply composition is currently supported. If both curves are gam
 <p>
 Copy an curve. 
 <p>
-Both dest and source must be valid curves previously created with <a class="el" href="group__curve.html#ga1">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid curves previously created with <a class="el" href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination curve. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source curve.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source curve. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="ga10" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="g48d9023f28ae2d15975002f7a9d7f94e"></a><!-- doxytag: member="curve.h::stp_curve_count_points" ref="g48d9023f28ae2d15975002f7a9d7f94e" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -465,7 +474,7 @@ Both dest and source must be valid curves previously created with <a class="el"
         <tr>
           <td class="md" nowrap valign="top">size_t stp_curve_count_points           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -489,19 +498,19 @@ Get the number of allocated points in the curve.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of points.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the number of points. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="ga1" args="(stp_curve_wrap_mode_t wrap)" --><p>
+<a class="anchor" name="gf6b71d25c497e99ab2c073108b080ab6"></a><!-- doxytag: member="curve.h::stp_curve_create" ref="gf6b71d25c497e99ab2c073108b080ab6" args="(stp_curve_wrap_mode_t wrap)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a>&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>wrap</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -526,19 +535,19 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann
     <tr><td valign="top"></td><td valign="top"><em>wrap</em>&nbsp;</td><td>the wrap mode of the curve. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="ga2" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="ge76787e84f2fc3ba299de94f4ecc6d82"></a><!-- doxytag: member="curve.h::stp_curve_create_copy" ref="ge76787e84f2fc3ba299de94f4ecc6d82" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -557,22 +566,22 @@ A wrapped curve has the same value at x=0 and x=1. The wrap mode of a curve cann
 <p>
 Copy and allocate an curve. 
 <p>
-dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__curve.html#ga1">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+dest will be created, and then the contents of source will be copied into it. dest must not have been previously allocated with <a class="el" href="group__curve.html#gf6b71d25c497e99ab2c073108b080ab6">stp_curve_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the source curve. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga44"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="ga44" args="(const char *file)" --><p>
+<a class="anchor" name="g6ff03fcc2a47f297c48b683884e81924"></a><!-- doxytag: member="curve.h::stp_curve_create_from_file" ref="g6ff03fcc2a47f297c48b683884e81924" args="(const char *file)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_file           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_file           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>file</em>          </td>
@@ -599,17 +608,17 @@ Create a curve from a stream.
     <tr><td valign="top"></td><td valign="top"><em>file</em>&nbsp;</td><td>the file to read. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga43"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="ga43" args="(FILE *fp)" --><p>
+<a class="anchor" name="g650e49e1250dab5d9221ad747a627fc0"></a><!-- doxytag: member="curve.h::stp_curve_create_from_stream" ref="g650e49e1250dab5d9221ad747a627fc0" args="(FILE *fp)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_stream           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_stream           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">FILE *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>fp</em>          </td>
@@ -636,17 +645,17 @@ Create a curve from a stream.
     <tr><td valign="top"></td><td valign="top"><em>fp</em>&nbsp;</td><td>the stream to read. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga45"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="ga45" args="(const char *string)" --><p>
+<a class="anchor" name="g60dce8c741a9b6fde73ced2134305298"></a><!-- doxytag: member="curve.h::stp_curve_create_from_string" ref="g60dce8c741a9b6fde73ced2134305298" args="(const char *string)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_string           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_string           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>string</em>          </td>
@@ -673,11 +682,11 @@ Create a curve from a string.
     <tr><td valign="top"></td><td valign="top"><em>string</em>&nbsp;</td><td>the string to read. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created curve, or NULL if an error occured. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="ga4" args="(stp_curve_t *curve)" --><p>
+<a class="anchor" name="g01bf94ed6a523f28dd909be054a69790"></a><!-- doxytag: member="curve.h::stp_curve_destroy" ref="g01bf94ed6a523f28dd909be054a69790" args="(stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -685,7 +694,7 @@ Create a curve from a string.
         <tr>
           <td class="md" nowrap valign="top">void stp_curve_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -706,13 +715,13 @@ Destroy an curve.
 <p>
 It is an error to destroy the curve more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to destroy. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="curve.h::stp_curve_get_bounds" ref="ga6" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
+<a class="anchor" name="g4d32e3000dd3a8f258b2eab94797731b"></a><!-- doxytag: member="curve.h::stp_curve_get_bounds" ref="g4d32e3000dd3a8f258b2eab94797731b" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -720,7 +729,7 @@ It is an error to destroy the curve more than once. <dl compact><dt><b>Parameter
         <tr>
           <td class="md" nowrap valign="top">void stp_curve_get_bounds           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -758,13 +767,13 @@ Get the lower and upper bounds on a curve.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>low</em>&nbsp;</td><td>a pointer to a double to store the lower bound in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the upper bound in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the upper bound in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="curve.h::stp_curve_get_data" ref="ga24" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="g24b9486c45d68983e94dcc0fb19edacd"></a><!-- doxytag: member="curve.h::stp_curve_get_data" ref="g24b9486c45d68983e94dcc0fb19edacd" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -772,7 +781,7 @@ Get the lower and upper bounds on a curve.
         <tr>
           <td class="md" nowrap valign="top">const double* stp_curve_get_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -806,11 +815,11 @@ Get a pointer to the curve's raw data.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="curve.h::stp_curve_get_data_points" ref="ga25" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="gd30e41654f1e0217aae3389b30cdffba"></a><!-- doxytag: member="curve.h::stp_curve_get_data_points" ref="gd30e41654f1e0217aae3389b30cdffba" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -818,7 +827,7 @@ Get a pointer to the curve's raw data.
         <tr>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__curve__point__t.html">stp_curve_point_t</a>* stp_curve_get_data_points           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -852,11 +861,11 @@ Get a pointer to the curve's raw data as points.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This call also returns NULL if the curve is a dense (equally-spaced) curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="curve.h::stp_curve_get_float_data" ref="ga26" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="gf363a0f9686bcd6521671d531bc522d5"></a><!-- doxytag: member="curve.h::stp_curve_get_float_data" ref="gf363a0f9686bcd6521671d531bc522d5" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -864,7 +873,7 @@ Get a pointer to the curve's raw data as points.
         <tr>
           <td class="md" nowrap valign="top">const float* stp_curve_get_float_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -898,11 +907,11 @@ Get pointer to the curve's raw data as floats.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga35"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="ga35" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="gc9786b35c2b1a55d54b62bcc57481c82"></a><!-- doxytag: member="curve.h::stp_curve_get_gamma" ref="gc9786b35c2b1a55d54b62bcc57481c82" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -910,7 +919,7 @@ Get pointer to the curve's raw data as floats.
         <tr>
           <td class="md" nowrap valign="top">double stp_curve_get_gamma           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -929,11 +938,11 @@ Get pointer to the curve's raw data as floats.
 <p>
 Get the gamma value of the curve. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the gamma value. A value of 0 indicates that the curve does not have a valid gamma value.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the gamma value. A value of 0 indicates that the curve does not have a valid gamma value. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="curve.h::stp_curve_get_int_data" ref="ga29" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="g01bda0b947a6075d4a1ed373865744e6"></a><!-- doxytag: member="curve.h::stp_curve_get_int_data" ref="g01bda0b947a6075d4a1ed373865744e6" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -941,7 +950,7 @@ Get the gamma value of the curve.
         <tr>
           <td class="md" nowrap valign="top">const int* stp_curve_get_int_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -975,19 +984,19 @@ Get pointer to the curve's raw data as integers.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="ga12" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="gca245aa6907c2fb95e150ce9a86ddb1a"></a><!-- doxytag: member="curve.h::stp_curve_get_interpolation_type" ref="gca245aa6907c2fb95e150ce9a86ddb1a" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a> stp_curve_get_interpolation_type           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a> stp_curve_get_interpolation_type           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1011,11 +1020,11 @@ Get the curve interpolation type.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the interpolation type.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the interpolation type. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="curve.h::stp_curve_get_long_data" ref="ga27" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="g187af251d5a89853545c8be898a00cc1"></a><!-- doxytag: member="curve.h::stp_curve_get_long_data" ref="g187af251d5a89853545c8be898a00cc1" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1023,7 +1032,7 @@ Get the curve interpolation type.
         <tr>
           <td class="md" nowrap valign="top">const long* stp_curve_get_long_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1057,11 +1066,11 @@ Get pointer to the curve's raw data as longs.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga37"></a><!-- doxytag: member="curve.h::stp_curve_get_point" ref="ga37" args="(const stp_curve_t *curve, size_t where, double *data)" --><p>
+<a class="anchor" name="gf9ff6f55ec0a0615608dc1baec6aff00"></a><!-- doxytag: member="curve.h::stp_curve_get_point" ref="gf9ff6f55ec0a0615608dc1baec6aff00" args="(const stp_curve_t *curve, size_t where, double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1069,7 +1078,7 @@ Get pointer to the curve's raw data as longs.
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_get_point           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1110,11 +1119,11 @@ Get a point along the curve.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to a double to store the value of where in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if where is outside of the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="curve.h::stp_curve_get_range" ref="ga9" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
+<a class="anchor" name="gaf8bad025ea7463067c9d7ab205af062"></a><!-- doxytag: member="curve.h::stp_curve_get_range" ref="gaf8bad025ea7463067c9d7ab205af062" args="(const stp_curve_t *curve, double *low, double *high)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1122,7 +1131,7 @@ Get a point along the curve.
         <tr>
           <td class="md" nowrap valign="top">void stp_curve_get_range           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1157,15 +1166,15 @@ Get a point along the curve.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga33"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="ga33" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="gee3cc69ab758b400838014df4742c28e"></a><!-- doxytag: member="curve.h::stp_curve_get_sequence" ref="gee3cc69ab758b400838014df4742c28e" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_curve_get_sequence           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_curve_get_sequence           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1189,11 +1198,11 @@ This can be used for fast access to the raw data. <dl compact><dt><b>Parameters:
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL;</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the stp_sequence_t. If the curve is a piecewise curve, the sequence returned is NULL; </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="curve.h::stp_curve_get_short_data" ref="ga31" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="g60767bb2143fe4d491d351a4c0abc3b1"></a><!-- doxytag: member="curve.h::stp_curve_get_short_data" ref="g60767bb2143fe4d491d351a4c0abc3b1" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1201,7 +1210,7 @@ This can be used for fast access to the raw data. <dl compact><dt><b>Parameters:
         <tr>
           <td class="md" nowrap valign="top">const short* stp_curve_get_short_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1235,19 +1244,19 @@ Get pointer to the curve's raw data as shorts.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="curve.h::stp_curve_get_subrange" ref="ga22" args="(const stp_curve_t *curve, size_t start, size_t count)" --><p>
+<a class="anchor" name="gd4cfbfbfe0c16b8f2ef4d8c44d221172"></a><!-- doxytag: member="curve.h::stp_curve_get_subrange" ref="gd4cfbfbfe0c16b8f2ef4d8c44d221172" args="(const stp_curve_t *curve, size_t start, size_t count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_get_subrange           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_get_subrange           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1288,11 +1297,11 @@ If the start or count is invalid, the returned curve will compare equal to NULL
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of point starting at start. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a curve containing the subrange. The returned curve is non-wrapping.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a curve containing the subrange. The returned curve is non-wrapping. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="curve.h::stp_curve_get_uint_data" ref="ga30" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="gb874365285383f3eb35c1a32496a69b4"></a><!-- doxytag: member="curve.h::stp_curve_get_uint_data" ref="gb874365285383f3eb35c1a32496a69b4" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1300,7 +1309,7 @@ If the start or count is invalid, the returned curve will compare equal to NULL
         <tr>
           <td class="md" nowrap valign="top">const unsigned int* stp_curve_get_uint_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1334,11 +1343,11 @@ Get pointer to the curve's raw data as unsigned integers.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="curve.h::stp_curve_get_ulong_data" ref="ga28" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="g3ecbc0ce98e7bd7695002306f5a2ba1b"></a><!-- doxytag: member="curve.h::stp_curve_get_ulong_data" ref="g3ecbc0ce98e7bd7695002306f5a2ba1b" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1346,7 +1355,7 @@ Get pointer to the curve's raw data as unsigned integers.
         <tr>
           <td class="md" nowrap valign="top">const unsigned long* stp_curve_get_ulong_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1380,11 +1389,11 @@ Get pointer to the curve's raw data as unsigned longs.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga32"></a><!-- doxytag: member="curve.h::stp_curve_get_ushort_data" ref="ga32" args="(const stp_curve_t *curve, size_t *count)" --><p>
+<a class="anchor" name="gb2312169172ec9789af9fd38279b3273"></a><!-- doxytag: member="curve.h::stp_curve_get_ushort_data" ref="gb2312169172ec9789af9fd38279b3273" args="(const stp_curve_t *curve, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1392,7 +1401,7 @@ Get pointer to the curve's raw data as unsigned longs.
         <tr>
           <td class="md" nowrap valign="top">const unsigned short* stp_curve_get_ushort_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1426,19 +1435,19 @@ Get pointer to the curve's raw data as unsigned shorts.
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>a pointer to a size_t to store the curve size in. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the curve data. This data is not guaranteed to be valid beyond the next non-const curve call. If the curve is a pure gamma curve (no associated points), NULL is returned and the count is 0. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="ga7" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="gd2aade6a22b516006ce0f897c5027f35"></a><!-- doxytag: member="curve.h::stp_curve_get_wrap" ref="gd2aade6a22b516006ce0f897c5027f35" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga48">stp_curve_wrap_mode_t</a> stp_curve_get_wrap           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#g1880ff988f772337e8892e791951337b">stp_curve_wrap_mode_t</a> stp_curve_get_wrap           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1462,11 +1471,11 @@ Get the wrapping mode.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the wrapping mode.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the wrapping mode. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga38"></a><!-- doxytag: member="curve.h::stp_curve_interpolate_value" ref="ga38" args="(const stp_curve_t *curve, double where, double *result)" --><p>
+<a class="anchor" name="g0fdfc2b27a8a464584589ef38a8e05c4"></a><!-- doxytag: member="curve.h::stp_curve_interpolate_value" ref="g0fdfc2b27a8a464584589ef38a8e05c4" args="(const stp_curve_t *curve, double where, double *result)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1474,7 +1483,7 @@ Get the wrapping mode.
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_interpolate_value           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1515,11 +1524,11 @@ Interpolate a point along the curve.
     <tr><td valign="top"></td><td valign="top"><em>result</em>&nbsp;</td><td>a pointer to double to store the value of where in. If interpolation would produce a value outside of the allowed range (as could happen with spline interpolation), the value is clipped to the range. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if 'where' is less than 0 or greater than the number of points, an error is returned. Also returns FALSE if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="ga8" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="gdda4313c874170e0086d2000ed04c02f"></a><!-- doxytag: member="curve.h::stp_curve_is_piecewise" ref="gdda4313c874170e0086d2000ed04c02f" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1527,7 +1536,7 @@ Interpolate a point along the curve.
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_is_piecewise           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1551,11 +1560,11 @@ Determine whether the curve is piecewise.
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>whether the curve is piecewise</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>whether the curve is piecewise </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga39"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="ga39" args="(stp_curve_t *curve, size_t points)" --><p>
+<a class="anchor" name="gf68cf2508ff4a14a0dbee6fc0001667e"></a><!-- doxytag: member="curve.h::stp_curve_resample" ref="gf68cf2508ff4a14a0dbee6fc0001667e" args="(stp_curve_t *curve, size_t points)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1563,7 +1572,7 @@ Determine whether the curve is piecewise.
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_resample           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1597,11 +1606,11 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
     <tr><td valign="top"></td><td valign="top"><em>points</em>&nbsp;</td><td>the number of points. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if the number of points is invalid (less than two, except that zero points is permitted for a gamma curve). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga40"></a><!-- doxytag: member="curve.h::stp_curve_rescale" ref="ga40" args="(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)" --><p>
+<a class="anchor" name="gd440d8d448173adc2be6737963a6e999"></a><!-- doxytag: member="curve.h::stp_curve_rescale" ref="gd440d8d448173adc2be6737963a6e999" args="(stp_curve_t *curve, double scale, stp_curve_compose_t mode, stp_curve_bounds_t bounds_mode)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1609,7 +1618,7 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_rescale           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1621,13 +1630,13 @@ This does not destroy the gamma value of a curve. Points are interpolated as req
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>mode</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga50">stp_curve_bounds_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gd2b61113497bb142943d5131df3286ae">stp_curve_bounds_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>bounds_mode</em></td>
         </tr>
         <tr>
@@ -1657,11 +1666,11 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
     <tr><td valign="top"></td><td valign="top"><em>bounds_mode</em>&nbsp;</td><td>the bounds exceeding mode. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if this would exceed floating point limits</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if this would exceed floating point limits </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="curve.h::stp_curve_set_bounds" ref="ga5" args="(stp_curve_t *curve, double low, double high)" --><p>
+<a class="anchor" name="g5283a18fcc5db8e9f9384d54de50ba83"></a><!-- doxytag: member="curve.h::stp_curve_set_bounds" ref="g5283a18fcc5db8e9f9384d54de50ba83" args="(stp_curve_t *curve, double low, double high)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1669,7 +1678,7 @@ This also rescales the bounds. Note that this currently destroys the gamma prope
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_bounds           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1710,11 +1719,11 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
     <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>the upper bound. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if any existing points on the curve are outside the bounds.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if any existing points on the curve are outside the bounds. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="curve.h::stp_curve_set_data" ref="ga13" args="(stp_curve_t *curve, size_t count, const double *data)" --><p>
+<a class="anchor" name="gba540befdbd82e705358b2175d5b92e8"></a><!-- doxytag: member="curve.h::stp_curve_set_data" ref="gba540befdbd82e705358b2175d5b92e8" args="(stp_curve_t *curve, size_t count, const double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1722,7 +1731,7 @@ To change the bounds adjusting data as required, use stp_curve_rescale instead.
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1763,11 +1772,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of doubles (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="curve.h::stp_curve_set_data_points" ref="ga14" args="(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)" --><p>
+<a class="anchor" name="gcbd01a2662edb48af0816930b40dc8ab"></a><!-- doxytag: member="curve.h::stp_curve_set_data_points" ref="gcbd01a2662edb48af0816930b40dc8ab" args="(stp_curve_t *curve, size_t count, const stp_curve_point_t *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1775,7 +1784,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_data_points           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1816,11 +1825,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of points (must be at least count in size). The first point must have X=0, and each point must have an X value at least .000001 greater than the previous point. If the curve is not a wraparound curve, the last point must have X=1. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="curve.h::stp_curve_set_float_data" ref="ga15" args="(stp_curve_t *curve, size_t count, const float *data)" --><p>
+<a class="anchor" name="gc0401bfefa3990ca26a0fb7718f1ebb2"></a><!-- doxytag: member="curve.h::stp_curve_set_float_data" ref="gc0401bfefa3990ca26a0fb7718f1ebb2" args="(stp_curve_t *curve, size_t count, const float *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1828,7 +1837,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_float_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1869,11 +1878,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of floats (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga34"></a><!-- doxytag: member="curve.h::stp_curve_set_gamma" ref="ga34" args="(stp_curve_t *curve, double f_gamma)" --><p>
+<a class="anchor" name="g6548b7ca6ef6ab94fe1d927c246e7baf"></a><!-- doxytag: member="curve.h::stp_curve_set_gamma" ref="g6548b7ca6ef6ab94fe1d927c246e7baf" args="(stp_curve_t *curve, double f_gamma)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1881,7 +1890,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_gamma           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1915,11 +1924,11 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
     <tr><td valign="top"></td><td valign="top"><em>f_gamma</em>&nbsp;</td><td>the gamma value to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if the gamma value is illegal (0, infinity, or NaN), or if the curve wraps around. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="curve.h::stp_curve_set_int_data" ref="ga18" args="(stp_curve_t *curve, size_t count, const int *data)" --><p>
+<a class="anchor" name="gbc9ae004e972c7d638336714f3112f9b"></a><!-- doxytag: member="curve.h::stp_curve_set_int_data" ref="gbc9ae004e972c7d638336714f3112f9b" args="(stp_curve_t *curve, size_t count, const int *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1927,7 +1936,7 @@ This replaces all existing points along the curve. The bounds are set to 0..1. I
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_int_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -1968,11 +1977,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of integers (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="curve.h::stp_curve_set_interpolation_type" ref="ga11" args="(stp_curve_t *curve, stp_curve_type_t itype)" --><p>
+<a class="anchor" name="g3175711d943e95fdf363d5124237a56e"></a><!-- doxytag: member="curve.h::stp_curve_set_interpolation_type" ref="g3175711d943e95fdf363d5124237a56e" args="(stp_curve_t *curve, stp_curve_type_t itype)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1980,13 +1989,13 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_interpolation_type           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga47">stp_curve_type_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#g7ced905b29f0d85de94258dceb01c3f4">stp_curve_type_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>itype</em></td>
         </tr>
         <tr>
@@ -2014,11 +2023,11 @@ Set the curve interpolation type.
     <tr><td valign="top"></td><td valign="top"><em>itype</em>&nbsp;</td><td>the interpolation type. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if itype is invalid.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if itype is invalid. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="curve.h::stp_curve_set_long_data" ref="ga16" args="(stp_curve_t *curve, size_t count, const long *data)" --><p>
+<a class="anchor" name="gaf770dcae26ce48d5ee50dd8217e2c14"></a><!-- doxytag: member="curve.h::stp_curve_set_long_data" ref="gaf770dcae26ce48d5ee50dd8217e2c14" args="(stp_curve_t *curve, size_t count, const long *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2026,7 +2035,7 @@ Set the curve interpolation type.
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_long_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2067,11 +2076,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of longs (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga36"></a><!-- doxytag: member="curve.h::stp_curve_set_point" ref="ga36" args="(stp_curve_t *curve, size_t where, double data)" --><p>
+<a class="anchor" name="g9a05eae4f274f420418539cceb627556"></a><!-- doxytag: member="curve.h::stp_curve_set_point" ref="g9a05eae4f274f420418539cceb627556" args="(stp_curve_t *curve, size_t where, double data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2079,7 +2088,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_point           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2120,11 +2129,11 @@ This call destroys any gamma value assigned to the curve. <dl compact><dt><b>Par
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the value to set where to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>FALSE if data is outside the valid bounds or if where is outside the number of valid points. This also returns NULL if the curve is a piecewise curve. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="curve.h::stp_curve_set_short_data" ref="ga20" args="(stp_curve_t *curve, size_t count, const short *data)" --><p>
+<a class="anchor" name="gd23dcc9abefca9a98b3ecd9714227093"></a><!-- doxytag: member="curve.h::stp_curve_set_short_data" ref="gd23dcc9abefca9a98b3ecd9714227093" args="(stp_curve_t *curve, size_t count, const short *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2132,7 +2141,7 @@ This call destroys any gamma value assigned to the curve. <dl compact><dt><b>Par
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_short_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2173,11 +2182,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of shorts (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="curve.h::stp_curve_set_subrange" ref="ga23" args="(stp_curve_t *curve, const stp_curve_t *range, size_t start)" --><p>
+<a class="anchor" name="g0ba6753a8beeaca19719d047da25ecb5"></a><!-- doxytag: member="curve.h::stp_curve_set_subrange" ref="g0ba6753a8beeaca19719d047da25ecb5" args="(stp_curve_t *curve, const stp_curve_t *range, size_t start)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2185,13 +2194,13 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_subrange           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>range</em>, </td>
         </tr>
         <tr>
@@ -2220,7 +2229,7 @@ If any of the data points fall outside the bounds, the operation is not performe
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="curve.h::stp_curve_set_uint_data" ref="ga19" args="(stp_curve_t *curve, size_t count, const unsigned int *data)" --><p>
+<a class="anchor" name="g8a215d4981a74fb2b6e4a0c381314df0"></a><!-- doxytag: member="curve.h::stp_curve_set_uint_data" ref="g8a215d4981a74fb2b6e4a0c381314df0" args="(stp_curve_t *curve, size_t count, const unsigned int *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2228,7 +2237,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_uint_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2269,11 +2278,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of unsigned integers (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="curve.h::stp_curve_set_ulong_data" ref="ga17" args="(stp_curve_t *curve, size_t count, const unsigned long *data)" --><p>
+<a class="anchor" name="g184e0e32892aae4b2c195c6fc880bace"></a><!-- doxytag: member="curve.h::stp_curve_set_ulong_data" ref="g184e0e32892aae4b2c195c6fc880bace" args="(stp_curve_t *curve, size_t count, const unsigned long *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2281,7 +2290,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_ulong_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2322,11 +2331,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of unsigned longs (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="curve.h::stp_curve_set_ushort_data" ref="ga21" args="(stp_curve_t *curve, size_t count, const unsigned short *data)" --><p>
+<a class="anchor" name="g4051de3e6be42f4499de78af67288616"></a><!-- doxytag: member="curve.h::stp_curve_set_ushort_data" ref="g4051de3e6be42f4499de78af67288616" args="(stp_curve_t *curve, size_t count, const unsigned short *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2334,7 +2343,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap valign="top">int stp_curve_set_ushort_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em>, </td>
         </tr>
         <tr>
@@ -2375,11 +2384,11 @@ If any of the data points fall outside the bounds, the operation is not performe
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an array of unsigned shorts (must be at least count in size). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga41"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="ga41" args="(FILE *file, const stp_curve_t *curve)" --><p>
+<a class="anchor" name="g6ef71ce7d92e659b1c902df29b1dcbc7"></a><!-- doxytag: member="curve.h::stp_curve_write" ref="g6ef71ce7d92e659b1c902df29b1dcbc7" args="(FILE *file, const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2393,7 +2402,7 @@ If any of the data points fall outside the bounds, the operation is not performe
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>curve</em></td>
         </tr>
         <tr>
@@ -2422,11 +2431,11 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga42"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="ga42" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="g21aa4497c58ebbb703dc3549560f084d"></a><!-- doxytag: member="curve.h::stp_curve_write_string" ref="g21aa4497c58ebbb703dc3549560f084d" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2434,7 +2443,7 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
         <tr>
           <td class="md" nowrap valign="top">char* stp_curve_write_string           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2459,12 +2468,12 @@ The printable representation is guaranteed to contain only 7-bit printable ASCII
     <tr><td valign="top"></td><td valign="top"><em>curve</em>&nbsp;</td><td>the curve to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to a string. This is allocated on the heap, and it is the caller's responsibility to free it. </dd></dl>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__image.html b/doc/gutenprint/html/group__image.html
index eee518f..718042c 100644
--- a/doc/gutenprint/html/group__image.html
+++ b/doc/gutenprint/html/group__image.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: image</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>image</h1>The image type is an abstract data type for interfacing with the image creation program.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -13,61 +22,39 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga16">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf71d7111a7215d4c1f1ef1317f9d6cfc">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7">stp_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gc5b6b70cd39959ffd06deab3724d87e9">stp_image_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#ga7"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="#gc5b6b70cd39959ffd06deab3724d87e9"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga17">stp_image_status_t</a> { <a class="el" href="group__image.html#gga17a2">STP_IMAGE_STATUS_OK</a>, 
-<a class="el" href="group__image.html#gga17a8">STP_IMAGE_STATUS_ABORT</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a> { <a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5">STP_IMAGE_STATUS_OK</a>, 
+<a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b">STP_IMAGE_STATUS_ABORT</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga17">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga9">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g74c2417d571861506be7209421a3b418">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga10">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g69cd20ccb54500d0ee8cf38969db69a6">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga11">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g9ee4915d4a1007f2d9c730ddc96d931b">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga12">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g48a99a9a8493b75687ad0900664ca4cb">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga17">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga13">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gfc93a7a3f6629f6826bf1f6f757f464e">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga14">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd36123431e93e049d813894aa039c25c">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga15">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd1017f2f9b91d7add73c2393d96f700a">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0">stp_image::reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1">stp_image::width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga2">stp_image::height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga17">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga3">stp_image::get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga4">stp_image::get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga5">stp_image::conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga6">stp_image::rep</a></td></tr>
-
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#ga6"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="ga16" args="" --><p>
+<a class="anchor" name="gf71d7111a7215d4c1f1ef1317f9d6cfc"></a><!-- doxytag: member="image.h::STP_CHANNEL_LIMIT" ref="gf71d7111a7215d4c1f1ef1317f9d6cfc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -91,7 +78,7 @@ The maximum number of channels.     </td>
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="image.h::stp_image_t" ref="ga7" args="" --><p>
+<a class="anchor" name="gc5b6b70cd39959ffd06deab3724d87e9"></a><!-- doxytag: member="image.h::stp_image_t" ref="gc5b6b70cd39959ffd06deab3724d87e9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -113,17 +100,17 @@ The maximum number of channels.     </td>
 <p>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
-It provides callbacks to functions defined within the client application which are called while printing the image.    </td>
+It provides callbacks to functions defined within the client application which are called while printing the image.     </td>
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="ga17" args="" --><p>
+<a class="anchor" name="g3378dd231cc63da06de0bb41f1cde78f"></a><!-- doxytag: member="image.h::stp_image_status_t" ref="g3378dd231cc63da06de0bb41f1cde78f" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__image.html#ga17">stp_image_status_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -141,9 +128,9 @@ Image status.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga17a2"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gga17a2" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5"></a><!-- doxytag: member="STP_IMAGE_STATUS_OK" ref="gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5" args="" -->STP_IMAGE_STATUS_OK</em>&nbsp;</td><td>
 Everything is OK. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga17a8"></a><!-- doxytag: member="STP_IMAGE_STATUS_ABORT" ref="gga17a8" args="" -->STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b"></a><!-- doxytag: member="STP_IMAGE_STATUS_ABORT" ref="gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b" args="" -->STP_IMAGE_STATUS_ABORT</em>&nbsp;</td><td>
 An error occured, or the job was aborted. </td></tr>
 </table>
 </dl>
@@ -151,7 +138,7 @@ An error occured, or the job was aborted. </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="ga15" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="gd1017f2f9b91d7add73c2393d96f700a"></a><!-- doxytag: member="image.h::stp_image_conclude" ref="gd1017f2f9b91d7add73c2393d96f700a" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -179,7 +166,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="ga14" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="gd36123431e93e049d813894aa039c25c"></a><!-- doxytag: member="image.h::stp_image_get_appname" ref="gd36123431e93e049d813894aa039c25c" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -207,13 +194,13 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="image.h::stp_image_get_row" ref="ga13" args="(stp_image_t *image, unsigned char *data, size_t limit, int row)" --><p>
+<a class="anchor" name="gfc93a7a3f6629f6826bf1f6f757f464e"></a><!-- doxytag: member="image.h::stp_image_get_row" ref="gfc93a7a3f6629f6826bf1f6f757f464e" args="(stp_image_t *image, unsigned char *data, size_t limit, int row)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#ga17">stp_image_status_t</a> stp_image_get_row           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a> stp_image_get_row           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__image.html">stp_image_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>image</em>, </td>
@@ -256,7 +243,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="image.h::stp_image_height" ref="ga12" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="g48a99a9a8493b75687ad0900664ca4cb"></a><!-- doxytag: member="image.h::stp_image_height" ref="g48a99a9a8493b75687ad0900664ca4cb" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -284,7 +271,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="image.h::stp_image_init" ref="ga9" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="g74c2417d571861506be7209421a3b418"></a><!-- doxytag: member="image.h::stp_image_init" ref="g74c2417d571861506be7209421a3b418" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -312,7 +299,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="image.h::stp_image_reset" ref="ga10" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="g69cd20ccb54500d0ee8cf38969db69a6"></a><!-- doxytag: member="image.h::stp_image_reset" ref="g69cd20ccb54500d0ee8cf38969db69a6" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -340,7 +327,7 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="image.h::stp_image_width" ref="ga11" args="(stp_image_t *image)" --><p>
+<a class="anchor" name="g9ee4915d4a1007f2d9c730ddc96d931b"></a><!-- doxytag: member="image.h::stp_image_width" ref="g9ee4915d4a1007f2d9c730ddc96d931b" args="(stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -368,208 +355,8 @@ An error occured, or the job was aborted. </td></tr>
     </td>
   </tr>
 </table>
-<hr><h2>Variable Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="stp_image::conclude" ref="ga5" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="group__image.html#ga5">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This callback is called at the end of each page. 
-<p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="stp_image::get_appname" ref="ga4" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">const char*(* <a class="el" href="group__image.html#ga4">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This callback returns the name of the application. 
-<p>
-This is embedded in the output by some drivers.    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="stp_image::get_row" ref="ga3" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#ga17">stp_image_status_t</a>(* <a class="el" href="group__image.html#ga3">stp_image::get_row</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This callback transfers the data from the image to the gimp-print library. 
-<p>
-It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="group__image.html#ga1">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). <dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to <a class="el" href="group__image.html#ga1">width()</a> bytes of pixel data. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>byte_limit</em>&nbsp;</td><td>(image width * number of channels). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>row</em>&nbsp;</td><td>(unused).</td></tr>
-  </table>
-</dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="stp_image::height" ref="ga2" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="group__image.html#ga2">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This callback returns the height of the image in pixels. 
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
-  </table>
-</dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="stp_image::rep" ref="ga6" args="" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void* <a class="el" href="group__image.html#ga6">stp_image::rep</a><code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-A pointer to an application-specific state information that might need to be associated with the image object. 
-<p>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="stp_image::reset" ref="ga0" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="group__image.html#ga0">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This callback is called to reset the image to the beginning. 
-<p>
-It may (in principle) be called multiple times if a page is being printed more than once. <dl compact><dt><b>Warning:</b></dt><dd>The <a class="el" href="group__image.html#ga0">reset()</a> call may be removed in the future. </dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
-  </table>
-</dl>
-    </td>
-  </tr>
-</table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="stp_image::width" ref="ga1" args=")(struct stp_image *image)" --><p>
-<table class="mdTable" cellpadding="2" cellspacing="0">
-  <tr>
-    <td class="mdRow">
-      <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="group__image.html#ga1">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)<code> [inherited]</code>          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-<table cellspacing="5" cellpadding="0" border="0">
-  <tr>
-    <td>
-      &nbsp;
-    </td>
-    <td>
-
-<p>
-This callback returns the width of the image in pixels. 
-<p>
-<dl compact><dt><b>Parameters:</b></dt><dd>
-  <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
-  </table>
-</dl>
-    </td>
-  </tr>
-</table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl.html b/doc/gutenprint/html/group__intl.html
index b9854da..917cb88 100644
--- a/doc/gutenprint/html/group__intl.html
+++ b/doc/gutenprint/html/group__intl.html
@@ -2,33 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: intl</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>intl</h1>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gac0316f33cabc5a70d974c5aba43063b">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#geb8333d9b46653f2047c603034d26730">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g7fd6ec2ffaa95339754232b69eaac521">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g52d955a76a73f0e86dddd07dda5cd490">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gcf29daa2fef5f417c57be476054c695b">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gd41443e9a10bd2ffa9508bb74c41c2d1">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g9de9caf5267f08d8164404a1f68b66f5">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. 
 <p>
-The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems).<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-intl.h::_" ref="ga5" args="(String)" --><p>
+The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). <hr><h2>Define Documentation</h2>
+<a class="anchor" name="gd41443e9a10bd2ffa9508bb74c41c2d1"></a><!-- doxytag: member="gutenprint-intl.h::_" ref="gd41443e9a10bd2ffa9508bb74c41c2d1" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -56,7 +65,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-intl.h::bindtextdomain" ref="ga4" args="(Domain, Directory)" --><p>
+<a class="anchor" name="gcf29daa2fef5f417c57be476054c695b"></a><!-- doxytag: member="gutenprint-intl.h::bindtextdomain" ref="gcf29daa2fef5f417c57be476054c695b" args="(Domain, Directory)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -87,7 +96,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-intl.h::dcgettext" ref="ga3" args="(Domain, Message, Type)" --><p>
+<a class="anchor" name="g52d955a76a73f0e86dddd07dda5cd490"></a><!-- doxytag: member="gutenprint-intl.h::dcgettext" ref="g52d955a76a73f0e86dddd07dda5cd490" args="(Domain, Message, Type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -121,7 +130,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-intl.h::dgettext" ref="ga2" args="(Domain, Message)" --><p>
+<a class="anchor" name="g7fd6ec2ffaa95339754232b69eaac521"></a><!-- doxytag: member="gutenprint-intl.h::dgettext" ref="g7fd6ec2ffaa95339754232b69eaac521" args="(Domain, Message)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -152,7 +161,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-intl.h::gettext" ref="ga1" args="(String)" --><p>
+<a class="anchor" name="geb8333d9b46653f2047c603034d26730"></a><!-- doxytag: member="gutenprint-intl.h::gettext" ref="geb8333d9b46653f2047c603034d26730" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -180,7 +189,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-intl.h::N_" ref="ga6" args="(String)" --><p>
+<a class="anchor" name="g9de9caf5267f08d8164404a1f68b66f5"></a><!-- doxytag: member="gutenprint-intl.h::N_" ref="g9de9caf5267f08d8164404a1f68b66f5" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -208,7 +217,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-intl.h::textdomain" ref="ga0" args="(String)" --><p>
+<a class="anchor" name="gac0316f33cabc5a70d974c5aba43063b"></a><!-- doxytag: member="gutenprint-intl.h::textdomain" ref="gac0316f33cabc5a70d974c5aba43063b" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -236,8 +245,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__intl__internal.html b/doc/gutenprint/html/group__intl__internal.html
index 2acd160..41f1bd7 100644
--- a/doc/gutenprint/html/group__intl__internal.html
+++ b/doc/gutenprint/html/group__intl__internal.html
@@ -2,33 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: intl-internal</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>intl-internal</h1>Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gac0316f33cabc5a70d974c5aba43063b">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#geb8333d9b46653f2047c603034d26730">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g7fd6ec2ffaa95339754232b69eaac521">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g52d955a76a73f0e86dddd07dda5cd490">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gcf29daa2fef5f417c57be476054c695b">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gd41443e9a10bd2ffa9508bb74c41c2d1">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g9de9caf5267f08d8164404a1f68b66f5">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions are used to localise Gimp-Print by translating strings into the user's native language. 
 <p>
-The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). They differ from the normal intl functions in that the textdomain is fixed, for use by functions internal to Gimp-Print. This header should not be included by source files outside the gimp-print source tree.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-intl-internal.h::_" ref="ga5" args="(String)" --><p>
+The macros defined in this header are convenience wrappers around the gettext functions provided by libintl library (or directly by libc on GNU systems). They differ from the normal intl functions in that the textdomain is fixed, for use by functions internal to Gimp-Print. This header should not be included by source files outside the gimp-print source tree. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="gd41443e9a10bd2ffa9508bb74c41c2d1"></a><!-- doxytag: member="gutenprint-intl-internal.h::_" ref="gd41443e9a10bd2ffa9508bb74c41c2d1" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -56,7 +65,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-intl-internal.h::bindtextdomain" ref="ga4" args="(Domain, Directory)" --><p>
+<a class="anchor" name="gcf29daa2fef5f417c57be476054c695b"></a><!-- doxytag: member="gutenprint-intl-internal.h::bindtextdomain" ref="gcf29daa2fef5f417c57be476054c695b" args="(Domain, Directory)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -87,7 +96,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-intl-internal.h::dcgettext" ref="ga3" args="(Domain, Message, Type)" --><p>
+<a class="anchor" name="g52d955a76a73f0e86dddd07dda5cd490"></a><!-- doxytag: member="gutenprint-intl-internal.h::dcgettext" ref="g52d955a76a73f0e86dddd07dda5cd490" args="(Domain, Message, Type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -121,7 +130,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-intl-internal.h::dgettext" ref="ga2" args="(Domain, Message)" --><p>
+<a class="anchor" name="g7fd6ec2ffaa95339754232b69eaac521"></a><!-- doxytag: member="gutenprint-intl-internal.h::dgettext" ref="g7fd6ec2ffaa95339754232b69eaac521" args="(Domain, Message)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -152,7 +161,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-intl-internal.h::gettext" ref="ga1" args="(String)" --><p>
+<a class="anchor" name="geb8333d9b46653f2047c603034d26730"></a><!-- doxytag: member="gutenprint-intl-internal.h::gettext" ref="geb8333d9b46653f2047c603034d26730" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -180,7 +189,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-intl-internal.h::N_" ref="ga6" args="(String)" --><p>
+<a class="anchor" name="g9de9caf5267f08d8164404a1f68b66f5"></a><!-- doxytag: member="gutenprint-intl-internal.h::N_" ref="g9de9caf5267f08d8164404a1f68b66f5" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -208,7 +217,7 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-intl-internal.h::textdomain" ref="ga0" args="(String)" --><p>
+<a class="anchor" name="gac0316f33cabc5a70d974c5aba43063b"></a><!-- doxytag: member="gutenprint-intl-internal.h::textdomain" ref="gac0316f33cabc5a70d974c5aba43063b" args="(String)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -236,8 +245,8 @@ The macros defined in this header are convenience wrappers around the gettext fu
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__list.html b/doc/gutenprint/html/group__list.html
index f12ea21..f550381 100644
--- a/doc/gutenprint/html/group__list.html
+++ b/doc/gutenprint/html/group__list.html
@@ -2,122 +2,131 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: list</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>list</h1>The list data type implements a fast generic doubly-linked list.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga1">stp_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="#g71c64aeca8ca0613215306f088b6a963"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="#g01be7c3ea8c46226978010d453016f22"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a> )(void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="#g3744d9043311d0bcbb21f80e79b9afba"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a> )(const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="#g589c7c30b003d694b844834a41a6b1fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> )(const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="#g1c6584d7cf0cda45dce5d95249af6470"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="#gd7ac92a42bf2184103e0a83147d1835f"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga6">stp_list_node_free_data</a> (void *item)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gb357e17f729e41b4f96d6aada1be26b9">stp_list_node_free_data</a> (void *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7">stp_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="#gb357e17f729e41b4f96d6aada1be26b9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gaf10e4bb8ce6a8b6f5f015475400eb1b">stp_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="#gaf10e4bb8ce6a8b6f5f015475400eb1b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g3bd2f5a42d3313287017bfe20859c2d9">stp_list_copy</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga9">stp_list_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="#g3bd2f5a42d3313287017bfe20859c2d9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g1382e926901b5efa2356176826a96a1a">stp_list_destroy</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga10">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="#g1382e926901b5efa2356176826a96a1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga67c8173f8c7b2c40e3d6dde6578faec">stp_list_get_start</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga11">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="#ga67c8173f8c7b2c40e3d6dde6578faec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g2ef0298e970fdb93955860e7ee3f878c">stp_list_get_end</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga12">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="#g2ef0298e970fdb93955860e7ee3f878c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g9885458dd0f6e6fe5c88c4b2b0643e2a">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga13">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="#g9885458dd0f6e6fe5c88c4b2b0643e2a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g0fd0ea2439ab2b0c9b9fb97f14c9a470">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga14">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="#g0fd0ea2439ab2b0c9b9fb97f14c9a470"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gdbf12ab6f47d68f2605f211023c4f520">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga15">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="#gdbf12ab6f47d68f2605f211023c4f520"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g013ca40ec7e5714fc5ee5f31ac5582bc">stp_list_get_length</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga16">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga2">stp_node_freefunc</a> freefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="#g013ca40ec7e5714fc5ee5f31ac5582bc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gc103cb4ff8870b3a8d90b6ebcade2498">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a> freefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga17">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="#gc103cb4ff8870b3a8d90b6ebcade2498"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g9d344e3c6874e6033f8fc71370678bcf">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga18">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> copyfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="#g9d344e3c6874e6033f8fc71370678bcf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gec59dd3b87efc811ef2b6303102ed279">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a> copyfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga19">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="#gec59dd3b87efc811ef2b6303102ed279"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g310dd79907494b07d9005fbf50b9eb0c">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga20">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="#g310dd79907494b07d9005fbf50b9eb0c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g97d7c6d659aa7d05bc54a349a07e10c0">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga21">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="#g97d7c6d659aa7d05bc54a349a07e10c0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g468cc0a5dfb1bfbef9eebd8d4f644492">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga22">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> long_namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="#g468cc0a5dfb1bfbef9eebd8d4f644492"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g42bdba5fcb861bdf8facb9135039d9b8">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> long_namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga23">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="#g42bdba5fcb861bdf8facb9135039d9b8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga95d8ace9b6ec71388007024c51865cb">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga24">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> sortfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="#ga95d8ace9b6ec71388007024c51865cb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gbad08ce8ef257dae054ea3816ae88fe7">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a> sortfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga25">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="#gbad08ce8ef257dae054ea3816ae88fe7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga759fd3cb97b9f651424b8a8fb6bedaa">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga26">stp_list_item_create</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *next, const void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="#ga759fd3cb97b9f651424b8a8fb6bedaa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g50f49648801707436012cd5dc66b1f8c">stp_list_item_create</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *next, const void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga27">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="#g50f49648801707436012cd5dc66b1f8c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gde2acf279e8ea067fdc1f3f951d0b373">stp_list_item_destroy</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga28">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="#gde2acf279e8ea067fdc1f3f951d0b373"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gcee23493eafdfcfce51e2ccf29ebbf54">stp_list_item_prev</a> (const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga29">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="#gcee23493eafdfcfce51e2ccf29ebbf54"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gea9c1b6daae518ebecd2981289c555f3">stp_list_item_next</a> (const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga30">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="#gea9c1b6daae518ebecd2981289c555f3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g5b7d8ffea5a806953a43aee961a60fe4">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga31">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="#g5b7d8ffea5a806953a43aee961a60fe4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g1b5d2889a81d712c3ba024e53bfd0f38">stp_list_item_set_data</a> (<a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item, void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="#ga31"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="#g1b5d2889a81d712c3ba024e53bfd0f38"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The list data type implements a fast generic doubly-linked list. 
 <p>
-It supports all of the operations you might want in a list (insert, remove, iterate over the list, copy whole lists), plus some (optional) less common features: finding items by index, name or long name, and sorting. These should also be fairly fast, due to caching in the list head.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="ga0" args="" --><p>
+It supports all of the operations you might want in a list (insert, remove, iterate over the list, copy whole lists), plus some (optional) less common features: finding items by index, name or long name, and sorting. These should also be fairly fast, due to caching in the list head. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g71c64aeca8ca0613215306f088b6a963"></a><!-- doxytag: member="list.h::stp_list_item_t" ref="g71c64aeca8ca0613215306f088b6a963" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_list_item <a class="el" href="group__list.html#ga0">stp_list_item_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_list_item <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -133,16 +142,16 @@ It supports all of the operations you might want in a list (insert, remove, iter
 <p>
 The list item opaque data type. 
 <p>
-This object is a node in the list.    </td>
+This object is a node in the list.     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="list.h::stp_list_t" ref="ga1" args="" --><p>
+<a class="anchor" name="g01be7c3ea8c46226978010d453016f22"></a><!-- doxytag: member="list.h::stp_list_t" ref="g01be7c3ea8c46226978010d453016f22" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_list <a class="el" href="group__list.html#ga1">stp_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_list <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -158,16 +167,16 @@ This object is a node in the list.    </td>
 <p>
 The list opaque data type. 
 <p>
-This object represents the list as a whole.    </td>
+This object represents the list as a whole.     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="ga3" args=")(const void *)" --><p>
+<a class="anchor" name="g589c7c30b003d694b844834a41a6b1fa"></a><!-- doxytag: member="list.h::stp_node_copyfunc" ref="g589c7c30b003d694b844834a41a6b1fa" args=")(const void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>)(const void *)          </td>
+          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a>)(const void *)          </td>
         </tr>
       </table>
     </td>
@@ -183,16 +192,16 @@ This object represents the list as a whole.    </td>
 <p>
 A callback function to copy the data a node contains. 
 <p>
-The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data.    </td>
+The parameter is a pointer to the node data. The return value is a pointer to the new copy of the data.     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="ga2" args=")(void *)" --><p>
+<a class="anchor" name="g3744d9043311d0bcbb21f80e79b9afba"></a><!-- doxytag: member="list.h::stp_node_freefunc" ref="g3744d9043311d0bcbb21f80e79b9afba" args=")(void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__list.html#ga2">stp_node_freefunc</a>)(void *)          </td>
+          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a>)(void *)          </td>
         </tr>
       </table>
     </td>
@@ -208,16 +217,16 @@ The parameter is a pointer to the node data. The return value is a pointer to th
 <p>
 A callback function to free the data a node contains. 
 <p>
-The parameter is a pointer to the node data.    </td>
+The parameter is a pointer to the node data.     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="ga4" args=")(const void *)" --><p>
+<a class="anchor" name="g1c6584d7cf0cda45dce5d95249af6470"></a><!-- doxytag: member="list.h::stp_node_namefunc" ref="g1c6584d7cf0cda45dce5d95249af6470" args=")(const void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef const char*(* <a class="el" href="group__list.html#ga4">stp_node_namefunc</a>)(const void *)          </td>
+          <td class="md" nowrap valign="top">typedef const char*(* <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>)(const void *)          </td>
         </tr>
       </table>
     </td>
@@ -233,16 +242,16 @@ The parameter is a pointer to the node data.    </td>
 <p>
 A callback function to get the name of a node. 
 <p>
-The parameter is a pointer to the node data. The return value is a pointer to the name of the node, or NULL if there is no name.    </td>
+The parameter is a pointer to the node data. The return value is a pointer to the name of the node, or NULL if there is no name.     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="ga5" args=")(const void *, const void *)" --><p>
+<a class="anchor" name="gd7ac92a42bf2184103e0a83147d1835f"></a><!-- doxytag: member="list.h::stp_node_sortfunc" ref="gd7ac92a42bf2184103e0a83147d1835f" args=")(const void *, const void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef int(* <a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>)(const void *, const void *)          </td>
+          <td class="md" nowrap valign="top">typedef int(* <a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a>)(const void *, const void *)          </td>
         </tr>
       </table>
     </td>
@@ -258,19 +267,19 @@ The parameter is a pointer to the node data. The return value is a pointer to th
 <p>
 A callback function to compare two nodes. 
 <p>
-The two parameters are pointers to node data. The return value is &lt;0 if the first sorts before the second, 0 if they sort identically, and &gt;0 if the first sorts after the second.    </td>
+The two parameters are pointers to node data. The return value is &lt;0 if the first sorts before the second, 0 if they sort identically, and &gt;0 if the first sorts after the second.     </td>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="list.h::stp_list_copy" ref="ga8" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="g3bd2f5a42d3313287017bfe20859c2d9"></a><!-- doxytag: member="list.h::stp_list_copy" ref="g3bd2f5a42d3313287017bfe20859c2d9" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_list_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_list_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -289,22 +298,22 @@ The two parameters are pointers to node data. The return value is &lt;0 if the f
 <p>
 Copy and allocate a list object. 
 <p>
-list must be a valid list object previously created with <a class="el" href="group__list.html#ga7">stp_list_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+list must be a valid list object previously created with <a class="el" href="group__list.html#gaf10e4bb8ce6a8b6f5f015475400eb1b">stp_list_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to copy. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the new copy of the list.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the new copy of the list. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="list.h::stp_list_create" ref="ga7" args="(void)" --><p>
+<a class="anchor" name="gaf10e4bb8ce6a8b6f5f015475400eb1b"></a><!-- doxytag: member="list.h::stp_list_create" ref="gaf10e4bb8ce6a8b6f5f015475400eb1b" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_list_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_list_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -325,11 +334,11 @@ list must be a valid list object previously created with <a class="el" href="gro
 <p>
 Create a new list object. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created list object.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created list object. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="ga9" args="(stp_list_t *list)" --><p>
+<a class="anchor" name="g1382e926901b5efa2356176826a96a1a"></a><!-- doxytag: member="list.h::stp_list_destroy" ref="g1382e926901b5efa2356176826a96a1a" args="(stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -337,7 +346,7 @@ Create a new list object.
         <tr>
           <td class="md" nowrap valign="top">int stp_list_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -361,19 +370,19 @@ It is an error to destroy the list more than once. <dl compact><dt><b>Parameters
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to destroy. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="ga19" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="g310dd79907494b07d9005fbf50b9eb0c"></a><!-- doxytag: member="list.h::stp_list_get_copyfunc" ref="g310dd79907494b07d9005fbf50b9eb0c" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> stp_list_get_copyfunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a> stp_list_get_copyfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -397,19 +406,19 @@ Get a list node copy function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_copyfunc, or NULL if no function has been set.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_copyfunc, or NULL if no function has been set. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="ga11" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="g2ef0298e970fdb93955860e7ee3f878c"></a><!-- doxytag: member="list.h::stp_list_get_end" ref="g2ef0298e970fdb93955860e7ee3f878c" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_end           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_end           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -433,19 +442,19 @@ Find the last item in a list.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the last list item, or NULL if the list is empty.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the last list item, or NULL if the list is empty. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="ga17" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="g9d344e3c6874e6033f8fc71370678bcf"></a><!-- doxytag: member="list.h::stp_list_get_freefunc" ref="g9d344e3c6874e6033f8fc71370678bcf" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a> stp_list_get_freefunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a> stp_list_get_freefunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -469,19 +478,19 @@ Get a list node free function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_freefunc, or NULL if no function has been set.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_freefunc, or NULL if no function has been set. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="list.h::stp_list_get_item_by_index" ref="ga12" args="(const stp_list_t *list, int idx)" --><p>
+<a class="anchor" name="g9885458dd0f6e6fe5c88c4b2b0643e2a"></a><!-- doxytag: member="list.h::stp_list_get_item_by_index" ref="g9885458dd0f6e6fe5c88c4b2b0643e2a" args="(const stp_list_t *list, int idx)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_item_by_index           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_item_by_index           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -515,19 +524,19 @@ Find an item in a list by its index.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index to find. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the index is invalid or the list is empty.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the index is invalid or the list is empty. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="list.h::stp_list_get_item_by_long_name" ref="ga14" args="(const stp_list_t *list, const char *long_name)" --><p>
+<a class="anchor" name="gdbf12ab6f47d68f2605f211023c4f520"></a><!-- doxytag: member="list.h::stp_list_get_item_by_long_name" ref="gdbf12ab6f47d68f2605f211023c4f520" args="(const stp_list_t *list, const char *long_name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_item_by_long_name           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_item_by_long_name           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -561,19 +570,19 @@ Find an item in a list by its long name.
     <tr><td valign="top"></td><td valign="top"><em>long_name</em>&nbsp;</td><td>the long name to find. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the long name is invalid or the list is empty.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the long name is invalid or the list is empty. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="list.h::stp_list_get_item_by_name" ref="ga13" args="(const stp_list_t *list, const char *name)" --><p>
+<a class="anchor" name="g0fd0ea2439ab2b0c9b9fb97f14c9a470"></a><!-- doxytag: member="list.h::stp_list_get_item_by_name" ref="g0fd0ea2439ab2b0c9b9fb97f14c9a470" args="(const stp_list_t *list, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_item_by_name           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_item_by_name           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -607,11 +616,11 @@ Find an item in a list by its name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name to find. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the name is invalid or the list is empty.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item, or NULL if the name is invalid or the list is empty. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="ga15" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="g013ca40ec7e5714fc5ee5f31ac5582bc"></a><!-- doxytag: member="list.h::stp_list_get_length" ref="g013ca40ec7e5714fc5ee5f31ac5582bc" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -619,7 +628,7 @@ Find an item in a list by its name.
         <tr>
           <td class="md" nowrap valign="top">int stp_list_get_length           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -643,19 +652,19 @@ Get the length of a list.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the list length (number of list items).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the list length (number of list items). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="ga23" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga95d8ace9b6ec71388007024c51865cb"></a><!-- doxytag: member="list.h::stp_list_get_long_namefunc" ref="ga95d8ace9b6ec71388007024c51865cb" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> stp_list_get_long_namefunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> stp_list_get_long_namefunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -679,19 +688,19 @@ Get a list node long name function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_long_namefunc, or NULL if no function has been set. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="ga21" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="g468cc0a5dfb1bfbef9eebd8d4f644492"></a><!-- doxytag: member="list.h::stp_list_get_namefunc" ref="g468cc0a5dfb1bfbef9eebd8d4f644492" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> stp_list_get_namefunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> stp_list_get_namefunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -715,19 +724,19 @@ Get a list node name function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_namefunc, or NULL if no function has been set.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_namefunc, or NULL if no function has been set. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="ga25" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga759fd3cb97b9f651424b8a8fb6bedaa"></a><!-- doxytag: member="list.h::stp_list_get_sortfunc" ref="ga759fd3cb97b9f651424b8a8fb6bedaa" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> stp_list_get_sortfunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a> stp_list_get_sortfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -751,19 +760,19 @@ Get a list node sort function.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_sortfunc, or NULL if no function has been set.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the function previously set with stp_list_set_sortfunc, or NULL if no function has been set. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="ga10" args="(const stp_list_t *list)" --><p>
+<a class="anchor" name="ga67c8173f8c7b2c40e3d6dde6578faec"></a><!-- doxytag: member="list.h::stp_list_get_start" ref="ga67c8173f8c7b2c40e3d6dde6578faec" args="(const stp_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_get_start           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_get_start           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -787,11 +796,11 @@ Find the first item in a list.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first list item, or NULL if the list is empty.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first list item, or NULL if the list is empty. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="list.h::stp_list_item_create" ref="ga26" args="(stp_list_t *list, stp_list_item_t *next, const void *data)" --><p>
+<a class="anchor" name="g50f49648801707436012cd5dc66b1f8c"></a><!-- doxytag: member="list.h::stp_list_item_create" ref="g50f49648801707436012cd5dc66b1f8c" args="(stp_list_t *list, stp_list_item_t *next, const void *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -799,13 +808,13 @@ Find the first item in a list.
         <tr>
           <td class="md" nowrap valign="top">int stp_list_item_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>next</em>, </td>
         </tr>
         <tr>
@@ -840,11 +849,11 @@ Create a new list item.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the data the list item will contain. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL, for example).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL, for example). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="list.h::stp_list_item_destroy" ref="ga27" args="(stp_list_t *list, stp_list_item_t *item)" --><p>
+<a class="anchor" name="gde2acf279e8ea067fdc1f3f951d0b373"></a><!-- doxytag: member="list.h::stp_list_item_destroy" ref="gde2acf279e8ea067fdc1f3f951d0b373" args="(stp_list_t *list, stp_list_item_t *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -852,13 +861,13 @@ Create a new list item.
         <tr>
           <td class="md" nowrap valign="top">int stp_list_item_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>item</em></td>
         </tr>
         <tr>
@@ -886,11 +895,11 @@ Destroy a list item.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the item to destroy. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="list.h::stp_list_item_get_data" ref="ga30" args="(const stp_list_item_t *item)" --><p>
+<a class="anchor" name="g5b7d8ffea5a806953a43aee961a60fe4"></a><!-- doxytag: member="list.h::stp_list_item_get_data" ref="g5b7d8ffea5a806953a43aee961a60fe4" args="(const stp_list_item_t *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -898,7 +907,7 @@ Destroy a list item.
         <tr>
           <td class="md" nowrap valign="top">void* stp_list_item_get_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -922,19 +931,19 @@ Get the data associated with a list item.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the list item to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the data associated with item.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the data associated with item. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="ga29" args="(const stp_list_item_t *item)" --><p>
+<a class="anchor" name="gea9c1b6daae518ebecd2981289c555f3"></a><!-- doxytag: member="list.h::stp_list_item_next" ref="gea9c1b6daae518ebecd2981289c555f3" args="(const stp_list_item_t *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_item_next           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_item_next           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -958,19 +967,19 @@ Get the next item in the list.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the item to start from. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item following from item, or NULL if item is the end of the list.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item following from item, or NULL if item is the end of the list. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="ga28" args="(const stp_list_item_t *item)" --><p>
+<a class="anchor" name="gcee23493eafdfcfce51e2ccf29ebbf54"></a><!-- doxytag: member="list.h::stp_list_item_prev" ref="gcee23493eafdfcfce51e2ccf29ebbf54" args="(const stp_list_item_t *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a>* stp_list_item_prev           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a>* stp_list_item_prev           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>item</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -994,11 +1003,11 @@ Get the previous item in the list.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the item to start from. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item prior to item, or NULL if item is the start of the list.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the list item prior to item, or NULL if item is the start of the list. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="list.h::stp_list_item_set_data" ref="ga31" args="(stp_list_item_t *item, void *data)" --><p>
+<a class="anchor" name="g1b5d2889a81d712c3ba024e53bfd0f38"></a><!-- doxytag: member="list.h::stp_list_item_set_data" ref="g1b5d2889a81d712c3ba024e53bfd0f38" args="(stp_list_item_t *item, void *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1006,7 +1015,7 @@ Get the previous item in the list.
         <tr>
           <td class="md" nowrap valign="top">int stp_list_item_set_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>item</em>, </td>
         </tr>
         <tr>
@@ -1041,11 +1050,11 @@ Set the data associated with a list item.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure (if data is NULL). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="ga6" args="(void *item)" --><p>
+<a class="anchor" name="gb357e17f729e41b4f96d6aada1be26b9"></a><!-- doxytag: member="list.h::stp_list_node_free_data" ref="gb357e17f729e41b4f96d6aada1be26b9" args="(void *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1074,13 +1083,13 @@ Free node data allocated with stp_malloc.
 <p>
 This function is indended for use as an stp_node_freefunc, which uses stp_free to free the node data. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the node data to free</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the node data to free </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="list.h::stp_list_set_copyfunc" ref="ga18" args="(stp_list_t *list, stp_node_copyfunc copyfunc)" --><p>
+<a class="anchor" name="gec59dd3b87efc811ef2b6303102ed279"></a><!-- doxytag: member="list.h::stp_list_set_copyfunc" ref="gec59dd3b87efc811ef2b6303102ed279" args="(stp_list_t *list, stp_node_copyfunc copyfunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1088,13 +1097,13 @@ This function is indended for use as an stp_node_freefunc, which uses stp_free t
         <tr>
           <td class="md" nowrap valign="top">void stp_list_set_copyfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>copyfunc</em></td>
         </tr>
         <tr>
@@ -1119,13 +1128,13 @@ Set a list node copy function.
 This callback function will be called whenever a list item is copied. Its intended use is for automatic object copying (since C lacks a copy constructor). <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>copyfunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>copyfunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="list.h::stp_list_set_freefunc" ref="ga16" args="(stp_list_t *list, stp_node_freefunc freefunc)" --><p>
+<a class="anchor" name="gc103cb4ff8870b3a8d90b6ebcade2498"></a><!-- doxytag: member="list.h::stp_list_set_freefunc" ref="gc103cb4ff8870b3a8d90b6ebcade2498" args="(stp_list_t *list, stp_node_freefunc freefunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1133,13 +1142,13 @@ This callback function will be called whenever a list item is copied. Its intend
         <tr>
           <td class="md" nowrap valign="top">void stp_list_set_freefunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>freefunc</em></td>
         </tr>
         <tr>
@@ -1164,13 +1173,13 @@ Set a list node free function.
 This callback function will be called whenever a list item is destroyed. Its intended use is for automatic object destruction and any other cleanup required. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>freefunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>freefunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="list.h::stp_list_set_long_namefunc" ref="ga22" args="(stp_list_t *list, stp_node_namefunc long_namefunc)" --><p>
+<a class="anchor" name="g42bdba5fcb861bdf8facb9135039d9b8"></a><!-- doxytag: member="list.h::stp_list_set_long_namefunc" ref="g42bdba5fcb861bdf8facb9135039d9b8" args="(stp_list_t *list, stp_node_namefunc long_namefunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1178,13 +1187,13 @@ This callback function will be called whenever a list item is destroyed. Its int
         <tr>
           <td class="md" nowrap valign="top">void stp_list_set_long_namefunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>long_namefunc</em></td>
         </tr>
         <tr>
@@ -1209,13 +1218,13 @@ Set a list node long name function.
 This callback function will be called whenever the long name of a list item needs to be determined. This is used to find list items by long name. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>long_namefunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>long_namefunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="list.h::stp_list_set_namefunc" ref="ga20" args="(stp_list_t *list, stp_node_namefunc namefunc)" --><p>
+<a class="anchor" name="g97d7c6d659aa7d05bc54a349a07e10c0"></a><!-- doxytag: member="list.h::stp_list_set_namefunc" ref="g97d7c6d659aa7d05bc54a349a07e10c0" args="(stp_list_t *list, stp_node_namefunc namefunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1223,13 +1232,13 @@ This callback function will be called whenever the long name of a list item need
         <tr>
           <td class="md" nowrap valign="top">void stp_list_set_namefunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>namefunc</em></td>
         </tr>
         <tr>
@@ -1254,13 +1263,13 @@ Set a list node name function.
 This callback function will be called whenever the name of a list item needs to be determined. This is used to find list items by name. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>namefunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>namefunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="list.h::stp_list_set_sortfunc" ref="ga24" args="(stp_list_t *list, stp_node_sortfunc sortfunc)" --><p>
+<a class="anchor" name="gbad08ce8ef257dae054ea3816ae88fe7"></a><!-- doxytag: member="list.h::stp_list_set_sortfunc" ref="gbad08ce8ef257dae054ea3816ae88fe7" args="(stp_list_t *list, stp_node_sortfunc sortfunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1268,13 +1277,13 @@ This callback function will be called whenever the name of a list item needs to
         <tr>
           <td class="md" nowrap valign="top">void stp_list_set_sortfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>sortfunc</em></td>
         </tr>
         <tr>
@@ -1299,14 +1308,14 @@ Set a list node sort function.
 This callback function will be called to determine the sort order for list items in sorted lists. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>sortfunc</em>&nbsp;</td><td>the function to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>sortfunc</em>&nbsp;</td><td>the function to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__papersize.html b/doc/gutenprint/html/group__papersize.html
index 7f25c62..d1284da 100644
--- a/doc/gutenprint/html/group__papersize.html
+++ b/doc/gutenprint/html/group__papersize.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: papersize</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>papersize</h1>The papersize describes the dimensions of a paper.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -13,40 +22,40 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga5a0">PAPERSIZE_ENGLISH_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a1">PAPERSIZE_METRIC_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a2">PAPERSIZE_ENGLISH_EXTENDED</a>, 
-<a class="el" href="group__papersize.html#gga5a3">PAPERSIZE_METRIC_EXTENDED</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65">PAPERSIZE_ENGLISH_STANDARD</a>, 
+<a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35">PAPERSIZE_METRIC_STANDARD</a>, 
+<a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d">PAPERSIZE_ENGLISH_EXTENDED</a>, 
+<a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a">PAPERSIZE_METRIC_EXTENDED</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga5">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga0">stp_known_papersizes</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g93eb4d6bc44914b3ea6b184e076a0853">stp_known_papersizes</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1">stp_get_papersize_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="#g93eb4d6bc44914b3ea6b184e076a0853"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g9d655e3de6954ad3c5933dc736d2509a">stp_get_papersize_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga2">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="#g9d655e3de6954ad3c5933dc736d2509a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g0438b0e4729f37579900b591e801f8ce">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga3">stp_get_papersize_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="#g0438b0e4729f37579900b591e801f8ce"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g08bb891f58a7decfee2b073c00715993">stp_get_papersize_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga4">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="#g08bb891f58a7decfee2b073c00715993"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g2fe5d85acaa4ff8b8e4ad1ff3cccb027">stp_default_media_size</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The papersize describes the dimensions of a paper. 
 <p>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="ga5" args="" --><p>
+<a class="anchor" name="gbb66a8f6ce85d70afd9fe42472b492d8"></a><!-- doxytag: member="paper.h::stp_papersize_unit_t" ref="gbb66a8f6ce85d70afd9fe42472b492d8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,13 +73,13 @@ Units of measurement.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga5a0"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_STANDARD" ref="gga5a0" args="" -->PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_STANDARD" ref="ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65" args="" -->PAPERSIZE_ENGLISH_STANDARD</em>&nbsp;</td><td>
 English/Imperial units. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga5a1"></a><!-- doxytag: member="PAPERSIZE_METRIC_STANDARD" ref="gga5a1" args="" -->PAPERSIZE_METRIC_STANDARD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35"></a><!-- doxytag: member="PAPERSIZE_METRIC_STANDARD" ref="ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35" args="" -->PAPERSIZE_METRIC_STANDARD</em>&nbsp;</td><td>
 Metric units. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga5a2"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_EXTENDED" ref="gga5a2" args="" -->PAPERSIZE_ENGLISH_EXTENDED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d"></a><!-- doxytag: member="PAPERSIZE_ENGLISH_EXTENDED" ref="ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d" args="" -->PAPERSIZE_ENGLISH_EXTENDED</em>&nbsp;</td><td>
 English/Imperial units (optional paper, not displayed by default). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga5a3"></a><!-- doxytag: member="PAPERSIZE_METRIC_EXTENDED" ref="gga5a3" args="" -->PAPERSIZE_METRIC_EXTENDED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a"></a><!-- doxytag: member="PAPERSIZE_METRIC_EXTENDED" ref="ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a" args="" -->PAPERSIZE_METRIC_EXTENDED</em>&nbsp;</td><td>
 Metric units (optional paper, not displayed by default). </td></tr>
 </table>
 </dl>
@@ -78,7 +87,7 @@ Metric units (optional paper, not displayed by default). </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="paper.h::stp_default_media_size" ref="ga4" args="(const stp_vars_t *v, int *width, int *height)" --><p>
+<a class="anchor" name="g2fe5d85acaa4ff8b8e4ad1ff3cccb027"></a><!-- doxytag: member="paper.h::stp_default_media_size" ref="g2fe5d85acaa4ff8b8e4ad1ff3cccb027" args="(const stp_vars_t *v, int *width, int *height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -86,7 +95,7 @@ Metric units (optional paper, not displayed by default). </td></tr>
         <tr>
           <td class="md" nowrap valign="top">void stp_default_media_size           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -121,7 +130,7 @@ Metric units (optional paper, not displayed by default). </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="ga3" args="(int idx)" --><p>
+<a class="anchor" name="g08bb891f58a7decfee2b073c00715993"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_index" ref="g08bb891f58a7decfee2b073c00715993" args="(int idx)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -153,11 +162,11 @@ Get a papersize by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of papers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="ga1" args="(const char *name)" --><p>
+<a class="anchor" name="g9d655e3de6954ad3c5933dc736d2509a"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_name" ref="g9d655e3de6954ad3c5933dc736d2509a" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -189,11 +198,11 @@ Get a papersize by name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the short unique name of the paper. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="ga2" args="(int length, int width)" --><p>
+<a class="anchor" name="g0438b0e4729f37579900b591e801f8ce"></a><!-- doxytag: member="paper.h::stp_get_papersize_by_size" ref="g0438b0e4729f37579900b591e801f8ce" args="(int length, int width)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -235,11 +244,11 @@ The nearest available size to the size requested will be found. <dl compact><dt>
     <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>the width of the paper </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the papersize, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="ga0" args="(void)" --><p>
+<a class="anchor" name="g93eb4d6bc44914b3ea6b184e076a0853"></a><!-- doxytag: member="paper.h::stp_known_papersizes" ref="g93eb4d6bc44914b3ea6b184e076a0853" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -266,12 +275,12 @@ The nearest available size to the size requested will be found. <dl compact><dt>
 <p>
 Get the number of available papersizes. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of papersizes.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the number of papersizes. </dd></dl>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__printer.html b/doc/gutenprint/html/group__printer.html
index 5fcb833..2f8ef0c 100644
--- a/doc/gutenprint/html/group__printer.html
+++ b/doc/gutenprint/html/group__printer.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: printer</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>printer</h1>The printer type represents a printer model.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -14,82 +23,82 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga0">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1">stp_family_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="#g1a68662b730d44c11de6fb8226a309f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g5c0458c3c1d19474e0245c47dac29e70">stp_family_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2">stp_printer_model_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc0a8108170f5c86621de14296fd94b1e">stp_printer_model_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga3">stp_get_printer_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="#gc0a8108170f5c86621de14296fd94b1e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g1286559c60d239563f9f15fdd27996e0">stp_get_printer_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="#g1286559c60d239563f9f15fdd27996e0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc041944e528afcb9a795eb6ece3fc6ff">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="#gc041944e528afcb9a795eb6ece3fc6ff"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g947fa230e08f9c854ca2608e76bd0d58">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="#g947fa230e08f9c854ca2608e76bd0d58"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcb4cdcada01ff29c5fd4ffeaa576db9e">stp_get_printer</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="#gcb4cdcada01ff29c5fd4ffeaa576db9e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6f32b0213b580bf081fc8752a3eb04a1">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga8">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="#g6f32b0213b580bf081fc8752a3eb04a1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g00182878bdc39935e6382d7e41d55294">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga9">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="#g00182878bdc39935e6382d7e41d55294"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6c6c426f86307660079277ab6e90ae3d">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga10">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="#g6c6c426f86307660079277ab6e90ae3d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g9c98ccc58b2c6f9ed6bd1025220ff77d">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="#g9c98ccc58b2c6f9ed6bd1025220ff77d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gfc0382fd32b49ea9d171e4ce8b750c62">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga12">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="#gfc0382fd32b49ea9d171e4ce8b750c62"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g7ba104f0ea5ce4a88175486894010b71">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga13">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="#g7ba104f0ea5ce4a88175486894010b71"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge67398e65540b835f5c5d073c5ea0ec1">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga14">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="#ge67398e65540b835f5c5d073c5ea0ec1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc3d8cdb65382cb13ea6b01072e6240d5">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga15">stp_print</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="#gc3d8cdb65382cb13ea6b01072e6240d5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g121125e6646c6f6d8965f1857450749e">stp_print</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga16">stp_start_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="#g121125e6646c6f6d8965f1857450749e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g9cf59fba866430dd47508bac6561ef67">stp_start_job</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga17">stp_end_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="#g9cf59fba866430dd47508bac6561ef67"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g40637834f08a166992325af09f6a6030">stp_end_job</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga18">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="#g40637834f08a166992325af09f6a6030"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc09e99e20c8a19a13a5fb6356742a92a">stp_get_model_id</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga19">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gd91f8e7a622725f0d47196cf912ddd8d">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga20">stp_family_register</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g82b22438444849bdedb4cfbe22f209e8">stp_family_register</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga21">stp_family_unregister</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2ab30a5e5442b7a552fc3b884e1511b">stp_family_unregister</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga22">stp_initialize_printer_defaults</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc9aba62164667822fd9f110740bab570">stp_initialize_printer_defaults</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga23">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g666486047edfe4405d003b5c3bbe4b49">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga24">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g806f00d4167762c7a3d467ec37c8430e">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga25">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g950e2cd193926440ba250dbc184d8588">stp_describe_output</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The printer type represents a printer model. 
 <p>
-A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="printers.h::stp_family_t" ref="ga1" args="" --><p>
+A particular printer model must selected in order to be able to print. Each printer model provides default print options through a default vars object. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g5c0458c3c1d19474e0245c47dac29e70"></a><!-- doxytag: member="printers.h::stp_family_t" ref="g5c0458c3c1d19474e0245c47dac29e70" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -112,13 +121,13 @@ A particular printer model must selected in order to be able to print. Each prin
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="ga0" args="" --><p>
+<a class="anchor" name="g1a68662b730d44c11de6fb8226a309f6"></a><!-- doxytag: member="printers.h::stp_printer_t" ref="g1a68662b730d44c11de6fb8226a309f6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_printer <a class="el" href="group__printer.html#ga0">stp_printer_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_printer <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -138,7 +147,7 @@ The printer opaque data type (representation of printer model).
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="ga25" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g950e2cd193926440ba250dbc184d8588"></a><!-- doxytag: member="printers.h::stp_describe_output" ref="g950e2cd193926440ba250dbc184d8588" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -146,7 +155,7 @@ The printer opaque data type (representation of printer model).
         <tr>
           <td class="md" nowrap valign="top">const char* stp_describe_output           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -166,7 +175,7 @@ The printer opaque data type (representation of printer model).
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="printers.h::stp_end_job" ref="ga17" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="g40637834f08a166992325af09f6a6030"></a><!-- doxytag: member="printers.h::stp_end_job" ref="g40637834f08a166992325af09f6a6030" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -174,7 +183,7 @@ The printer opaque data type (representation of printer model).
         <tr>
           <td class="md" nowrap valign="top">int stp_end_job           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -208,11 +217,11 @@ End a print job.
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image to print. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="printers.h::stp_family_register" ref="ga20" args="(stp_list_t *family)" --><p>
+<a class="anchor" name="g82b22438444849bdedb4cfbe22f209e8"></a><!-- doxytag: member="printers.h::stp_family_register" ref="g82b22438444849bdedb4cfbe22f209e8" args="(stp_list_t *family)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -220,7 +229,7 @@ End a print job.
         <tr>
           <td class="md" nowrap valign="top">int stp_family_register           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>family</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -240,7 +249,7 @@ End a print job.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="ga21" args="(stp_list_t *family)" --><p>
+<a class="anchor" name="ga2ab30a5e5442b7a552fc3b884e1511b"></a><!-- doxytag: member="printers.h::stp_family_unregister" ref="ga2ab30a5e5442b7a552fc3b884e1511b" args="(stp_list_t *family)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -248,7 +257,7 @@ End a print job.
         <tr>
           <td class="md" nowrap valign="top">int stp_family_unregister           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>family</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -268,7 +277,7 @@ End a print job.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="ga18" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="gc09e99e20c8a19a13a5fb6356742a92a"></a><!-- doxytag: member="printers.h::stp_get_model_id" ref="gc09e99e20c8a19a13a5fb6356742a92a" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -276,7 +285,7 @@ End a print job.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_model_id           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -296,15 +305,15 @@ End a print job.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="ga6" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="gcb4cdcada01ff29c5fd4ffeaa576db9e"></a><!-- doxytag: member="printers.h::stp_get_printer" ref="gcb4cdcada01ff29c5fd4ffeaa576db9e" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -328,17 +337,17 @@ Get the printer model from a vars object.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="ga5" args="(const char *driver)" --><p>
+<a class="anchor" name="g947fa230e08f9c854ca2608e76bd0d58"></a><!-- doxytag: member="printers.h::stp_get_printer_by_driver" ref="g947fa230e08f9c854ca2608e76bd0d58" args="(const char *driver)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer_by_driver           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer_by_driver           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>driver</em>          </td>
@@ -364,17 +373,17 @@ Get a printer model by its short name.
     <tr><td valign="top"></td><td valign="top"><em>driver</em>&nbsp;</td><td>the printer model's short (driver) name. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="ga3" args="(int idx)" --><p>
+<a class="anchor" name="g1286559c60d239563f9f15fdd27996e0"></a><!-- doxytag: member="printers.h::stp_get_printer_by_index" ref="g1286559c60d239563f9f15fdd27996e0" args="(int idx)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer_by_index           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer_by_index           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">int&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>idx</em>          </td>
@@ -400,17 +409,17 @@ Get a printer model by its index number.
     <tr><td valign="top"></td><td valign="top"><em>idx</em>&nbsp;</td><td>the index number. This must not be greater than (total number of printers - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="ga4" args="(const char *long_name)" --><p>
+<a class="anchor" name="gc041944e528afcb9a795eb6ece3fc6ff"></a><!-- doxytag: member="printers.h::stp_get_printer_by_long_name" ref="gc041944e528afcb9a795eb6ece3fc6ff" args="(const char *long_name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a>* stp_get_printer_by_long_name           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a>* stp_get_printer_by_long_name           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>long_name</em>          </td>
@@ -436,11 +445,11 @@ Get a printer model by its long (translated) name.
     <tr><td valign="top"></td><td valign="top"><em>long_name</em>&nbsp;</td><td>the printer model's long (translated) name. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the printer model, or NULL on failure. The pointer should not be freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="ga7" args="(const char *driver)" --><p>
+<a class="anchor" name="g6f32b0213b580bf081fc8752a3eb04a1"></a><!-- doxytag: member="printers.h::stp_get_printer_index_by_driver" ref="g6f32b0213b580bf081fc8752a3eb04a1" args="(const char *driver)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -467,17 +476,17 @@ Get a printer model by its long (translated) name.
 <p>
 Get the printer index number from the printer model short (driver) name. 
 <p>
-<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000001">Deprecated:</a></b></dt><dd>There should never be any need to use this function.</dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
+<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000001">Deprecated:</a></b></dt><dd>There should never be any need to use this function. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>driver</em>&nbsp;</td><td>the printer model's short (driver) name. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the index number, or -1 on failure. </dd></dl>
+</dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="ga22" args="(void)" --><p>
+<a class="anchor" name="gc9aba62164667822fd9f110740bab570"></a><!-- doxytag: member="printers.h::stp_initialize_printer_defaults" ref="gc9aba62164667822fd9f110740bab570" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -505,7 +514,7 @@ Get the printer index number from the printer model short (driver) name.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="printers.h::stp_print" ref="ga15" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="g121125e6646c6f6d8965f1857450749e"></a><!-- doxytag: member="printers.h::stp_print" ref="g121125e6646c6f6d8965f1857450749e" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -513,7 +522,7 @@ Get the printer index number from the printer model short (driver) name.
         <tr>
           <td class="md" nowrap valign="top">int stp_print           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -548,11 +557,11 @@ Print the image.
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image to print. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success, 2 on abort requested by the driver.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success, 2 on abort requested by the driver. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="printers.h::stp_printer_describe_parameter" ref="ga24" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
+<a class="anchor" name="g806f00d4167762c7a3d467ec37c8430e"></a><!-- doxytag: member="printers.h::stp_printer_describe_parameter" ref="g806f00d4167762c7a3d467ec37c8430e" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -560,7 +569,7 @@ Print the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_printer_describe_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -595,15 +604,15 @@ Print the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="ga13" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="ge67398e65540b835f5c5d073c5ea0ec1"></a><!-- doxytag: member="printers.h::stp_printer_get_defaults" ref="ge67398e65540b835f5c5d073c5ea0ec1" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_printer_get_defaults           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_printer_get_defaults           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -627,11 +636,11 @@ The default vars should be copied to a new vars object and customised prior to p
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the printer model's default vars.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the printer model's default vars. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="ga9" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="g6c6c426f86307660079277ab6e90ae3d"></a><!-- doxytag: member="printers.h::stp_printer_get_driver" ref="g6c6c426f86307660079277ab6e90ae3d" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -639,7 +648,7 @@ The default vars should be copied to a new vars object and customised prior to p
         <tr>
           <td class="md" nowrap valign="top">const char* stp_printer_get_driver           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -663,11 +672,11 @@ Get a printer model's short (driver) name.
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the short name (should never be freed).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the short name (should never be freed). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="ga10" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="g9c98ccc58b2c6f9ed6bd1025220ff77d"></a><!-- doxytag: member="printers.h::stp_printer_get_family" ref="g9c98ccc58b2c6f9ed6bd1025220ff77d" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -675,7 +684,7 @@ Get a printer model's short (driver) name.
         <tr>
           <td class="md" nowrap valign="top">const char* stp_printer_get_family           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -699,11 +708,11 @@ The family name is the name of the modular "family" driver this model uses. <dl
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the family name (should never be freed).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the family name (should never be freed). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="ga8" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="g00182878bdc39935e6382d7e41d55294"></a><!-- doxytag: member="printers.h::stp_printer_get_long_name" ref="g00182878bdc39935e6382d7e41d55294" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -711,7 +720,7 @@ The family name is the name of the modular "family" driver this model uses. <dl
         <tr>
           <td class="md" nowrap valign="top">const char* stp_printer_get_long_name           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -735,11 +744,11 @@ Get a printer model's long (translated) name.
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the long name (should never be freed).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the long name (should never be freed). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="ga11" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="gfc0382fd32b49ea9d171e4ce8b750c62"></a><!-- doxytag: member="printers.h::stp_printer_get_manufacturer" ref="gfc0382fd32b49ea9d171e4ce8b750c62" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -747,7 +756,7 @@ Get a printer model's long (translated) name.
         <tr>
           <td class="md" nowrap valign="top">const char* stp_printer_get_manufacturer           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -771,11 +780,11 @@ Get a printer model's manufacturer's name.
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the manufacturer's name (should never be freed).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the manufacturer's name (should never be freed). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="ga12" args="(const stp_printer_t *p)" --><p>
+<a class="anchor" name="g7ba104f0ea5ce4a88175486894010b71"></a><!-- doxytag: member="printers.h::stp_printer_get_model" ref="g7ba104f0ea5ce4a88175486894010b71" args="(const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -783,7 +792,7 @@ Get a printer model's manufacturer's name.
         <tr>
           <td class="md" nowrap valign="top">int stp_printer_get_model           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -807,19 +816,19 @@ The model number is used internally by the "family" driver module, and has no me
     <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the model number.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the model number. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="ga23" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g666486047edfe4405d003b5c3bbe4b49"></a><!-- doxytag: member="printers.h::stp_printer_list_parameters" ref="g666486047edfe4405d003b5c3bbe4b49" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_printer_list_parameters           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_printer_list_parameters           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -839,7 +848,7 @@ The model number is used internally by the "family" driver module, and has no me
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="ga2" args="(void)" --><p>
+<a class="anchor" name="gc0a8108170f5c86621de14296fd94b1e"></a><!-- doxytag: member="printers.h::stp_printer_model_count" ref="gc0a8108170f5c86621de14296fd94b1e" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -866,11 +875,11 @@ The model number is used internally by the "family" driver module, and has no me
 <p>
 Get the number of available printer models. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of printer models.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the number of printer models. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults" ref="ga14" args="(stp_vars_t *v, const stp_printer_t *p)" --><p>
+<a class="anchor" name="gc3d8cdb65382cb13ea6b01072e6240d5"></a><!-- doxytag: member="printers.h::stp_set_printer_defaults" ref="gc3d8cdb65382cb13ea6b01072e6240d5" args="(stp_vars_t *v, const stp_printer_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -878,13 +887,13 @@ Get the number of available printer models.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_printer_defaults           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>p</em></td>
         </tr>
         <tr>
@@ -909,13 +918,13 @@ Set a vars object to use a particular driver, and set the parameter to its defau
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>p</em>&nbsp;</td><td>the printer model to use. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="printers.h::stp_start_job" ref="ga16" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="g9cf59fba866430dd47508bac6561ef67"></a><!-- doxytag: member="printers.h::stp_start_job" ref="g9cf59fba866430dd47508bac6561ef67" args="(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -923,7 +932,7 @@ Set a vars object to use a particular driver, and set the parameter to its defau
         <tr>
           <td class="md" nowrap valign="top">int stp_start_job           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -951,18 +960,18 @@ Set a vars object to use a particular driver, and set the parameter to its defau
 <p>
 Start a print job. 
 <p>
-<dl compact><dt><b>Warning:</b></dt><dd>This function must be called prior to the first call to <a class="el" href="group__printer.html#ga15">stp_print()</a>. </dd></dl>
+<dl compact><dt><b>Warning:</b></dt><dd>This function must be called prior to the first call to <a class="el" href="group__printer.html#g121125e6646c6f6d8965f1857450749e">stp_print()</a>. </dd></dl>
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image to print. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="ga19" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="gd91f8e7a622725f0d47196cf912ddd8d"></a><!-- doxytag: member="printers.h::stp_verify_printer_params" ref="gd91f8e7a622725f0d47196cf912ddd8d" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -970,7 +979,7 @@ Start a print job.
         <tr>
           <td class="md" nowrap valign="top">int stp_verify_printer_params           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -990,8 +999,8 @@ Start a print job.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__sequence.html b/doc/gutenprint/html/group__sequence.html
index 27e44e8..c9df74c 100644
--- a/doc/gutenprint/html/group__sequence.html
+++ b/doc/gutenprint/html/group__sequence.html
@@ -2,113 +2,122 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: sequence</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>sequence</h1>The sequence is a simple "vector of numbers" data structure.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="#gb3d4cae653c4303a6e5d26b516694c92"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1">stp_sequence_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee">stp_sequence_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga2">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="#g771327bed5a71d8d33cc6b3ec5cbdbee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g98c9c2859d2ebe9b1987d26b62bd6ce0">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="#g98c9c2859d2ebe9b1987d26b62bd6ce0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g5792d6f821525514199dd2d9b332ddd4">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="#g5792d6f821525514199dd2d9b332ddd4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd37eb66db88ac93b853ba6e02b9155bc">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="#gd37eb66db88ac93b853ba6e02b9155bc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd56df3112937c11431e033f2d9574b96">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga6">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="#gd56df3112937c11431e033f2d9574b96"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g392e1da122d95d6fc07b6d73eff1d311">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga7">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="#g392e1da122d95d6fc07b6d73eff1d311"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gc2c70c539a3eced45be306d082faa3a6">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga8">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="#gc2c70c539a3eced45be306d082faa3a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g166e9a610bd53cb812e328d9e111f240">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="#g166e9a610bd53cb812e328d9e111f240"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g99292c5ba10bcf1574c3e71a593c3e5f">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga10">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="#g99292c5ba10bcf1574c3e71a593c3e5f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g24024e771a50db02f2713b244212603e">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga11">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="#g24024e771a50db02f2713b244212603e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g9b41ba7e0f1fb00cf19bbb9efe70824d">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="#g9b41ba7e0f1fb00cf19bbb9efe70824d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga13">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="#gc33208fae031bd1111f8ceb4c1425199"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gf7f49101192387e29399ded6d3166d13">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="#gf7f49101192387e29399ded6d3166d13"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g044210129f28c298152ce124371324d4">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga15">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="#g044210129f28c298152ce124371324d4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g34a526cb5e72b611ac8a98b559c24e2e">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga16">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="#g34a526cb5e72b611ac8a98b559c24e2e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd15e2cf350bb311da58f4b11240fa0f2">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga17">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="#gd15e2cf350bb311da58f4b11240fa0f2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gbc7ec322716d761436e4ad2d5d2f756f">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga18">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="#gbc7ec322716d761436e4ad2d5d2f756f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd4f058b2c690ad4e326970cc841d8f79">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga19">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="#gd4f058b2c690ad4e326970cc841d8f79"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g40cd6256eb5bb72decd60edd1dc3be54">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="#g40cd6256eb5bb72decd60edd1dc3be54"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ge0d6719f863a10422dea23e7f4b4dd29">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga21">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="#ge0d6719f863a10422dea23e7f4b4dd29"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g68aed44bbf6ede9ac49237091f2deb43">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga22">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="#g68aed44bbf6ede9ac49237091f2deb43"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gf8cd9da688af479103cf8600e48f61c9">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga23">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="#gf8cd9da688af479103cf8600e48f61c9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g864b55caa3a8c0e573031a36f57f7cc4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga24">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="#g864b55caa3a8c0e573031a36f57f7cc4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gc4557b9fba98a7fbb4e17cc18fb0dded">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga25">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="#gc4557b9fba98a7fbb4e17cc18fb0dded"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g4396baf0d338eec6f3bce3e2000da978">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga26">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="#g4396baf0d338eec6f3bce3e2000da978"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g204f77e91c9283dc6ec6e742687bb0db">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga27">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="#g204f77e91c9283dc6ec6e742687bb0db"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g91a68efd6b99150739c7706f65703a2f">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="#g91a68efd6b99150739c7706f65703a2f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g8bf46faeea891ac7ca699591df596bc1">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="#ga28"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="#g8bf46faeea891ac7ca699591df596bc1"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The sequence is a simple "vector of numbers" data structure. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="ga0" args="" --><p>
+<a class="anchor" name="gb3d4cae653c4303a6e5d26b516694c92"></a><!-- doxytag: member="sequence.h::stp_sequence_t" ref="gb3d4cae653c4303a6e5d26b516694c92" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_sequence <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_sequence <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -128,7 +137,7 @@ The sequence opaque data type.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="sequence.h::stp_sequence_copy" ref="ga3" args="(stp_sequence_t *dest, const stp_sequence_t *source)" --><p>
+<a class="anchor" name="g5792d6f821525514199dd2d9b332ddd4"></a><!-- doxytag: member="sequence.h::stp_sequence_copy" ref="g5792d6f821525514199dd2d9b332ddd4" args="(stp_sequence_t *dest, const stp_sequence_t *source)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -136,13 +145,13 @@ The sequence opaque data type.
         <tr>
           <td class="md" nowrap valign="top">void stp_sequence_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>dest</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -164,22 +173,22 @@ The sequence opaque data type.
 <p>
 Copy an sequence. 
 <p>
-Both dest and source must be valid sequences previously created with <a class="el" href="group__sequence.html#ga1">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid sequences previously created with <a class="el" href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination sequence. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source sequence.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source sequence. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="ga1" args="(void)" --><p>
+<a class="anchor" name="g771327bed5a71d8d33cc6b3ec5cbdbee"></a><!-- doxytag: member="sequence.h::stp_sequence_create" ref="g771327bed5a71d8d33cc6b3ec5cbdbee" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_sequence_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_sequence_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -200,19 +209,19 @@ Both dest and source must be valid sequences previously created with <a class="e
 <p>
 Create a new sequence. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created sequence.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created sequence. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="ga4" args="(const stp_sequence_t *sequence)" --><p>
+<a class="anchor" name="gd37eb66db88ac93b853ba6e02b9155bc"></a><!-- doxytag: member="sequence.h::stp_sequence_create_copy" ref="gd37eb66db88ac93b853ba6e02b9155bc" args="(const stp_sequence_t *sequence)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_sequence_create_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_sequence_create_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -231,16 +240,16 @@ Create a new sequence.
 <p>
 Copy and allocate an sequence. 
 <p>
-A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with <a class="el" href="group__sequence.html#ga1">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+A new sequence will be created, and then the contents of source will be copied into it. The destination must not have been previously allocated with <a class="el" href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee">stp_sequence_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the source sequence. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the sequence.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the sequence. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="ga2" args="(stp_sequence_t *sequence)" --><p>
+<a class="anchor" name="g98c9c2859d2ebe9b1987d26b62bd6ce0"></a><!-- doxytag: member="sequence.h::stp_sequence_destroy" ref="g98c9c2859d2ebe9b1987d26b62bd6ce0" args="(stp_sequence_t *sequence)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -248,7 +257,7 @@ A new sequence will be created, and then the contents of source will be copied i
         <tr>
           <td class="md" nowrap valign="top">void stp_sequence_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -269,13 +278,13 @@ Destroy a sequence.
 <p>
 It is an error to destroy the sequence more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to destroy. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="sequence.h::stp_sequence_get_bounds" ref="ga6" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
+<a class="anchor" name="g392e1da122d95d6fc07b6d73eff1d311"></a><!-- doxytag: member="sequence.h::stp_sequence_get_bounds" ref="g392e1da122d95d6fc07b6d73eff1d311" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -283,7 +292,7 @@ It is an error to destroy the sequence more than once. <dl compact><dt><b>Parame
         <tr>
           <td class="md" nowrap valign="top">void stp_sequence_get_bounds           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -321,13 +330,13 @@ The values are stored in the variables pointed to by low and high. <dl compact><
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to work on. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>low</em>&nbsp;</td><td>a pointer to a double to store the low bound in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="sequence.h::stp_sequence_get_data" ref="ga12" args="(const stp_sequence_t *sequence, size_t *size, const double **data)" --><p>
+<a class="anchor" name="gc33208fae031bd1111f8ceb4c1425199"></a><!-- doxytag: member="sequence.h::stp_sequence_get_data" ref="gc33208fae031bd1111f8ceb4c1425199" args="(const stp_sequence_t *sequence, size_t *size, const double **data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -335,7 +344,7 @@ The values are stored in the variables pointed to by low and high. <dl compact><
         <tr>
           <td class="md" nowrap valign="top">void stp_sequence_get_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -373,17 +382,17 @@ Get the data in a sequence.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to get the data from. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>size</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an sequence of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence;
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first element of an sequence of doubles is stored in a pointer to double*. <div class="fragment"><pre class="fragment"> <a class="code" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence;
  size_t size;
  <span class="keywordtype">double</span> *data;
- <a class="code" href="group__sequence.html#ga12">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
-</pre></div></td></tr>
+ <a class="code" href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199">stp_sequence_get_data</a>(sequence, &amp;size, &amp;data);
+</pre></div> </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="sequence.h::stp_sequence_get_float_data" ref="ga22" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="gf8cd9da688af479103cf8600e48f61c9"></a><!-- doxytag: member="sequence.h::stp_sequence_get_float_data" ref="gf8cd9da688af479103cf8600e48f61c9" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -391,7 +400,7 @@ Get the data in a sequence.
         <tr>
           <td class="md" nowrap valign="top">const float* stp_sequence_get_float_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -425,11 +434,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of floats is stored in a pointer to float*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of floats is stored in a pointer to float*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="sequence.h::stp_sequence_get_int_data" ref="ga25" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="g4396baf0d338eec6f3bce3e2000da978"></a><!-- doxytag: member="sequence.h::stp_sequence_get_int_data" ref="g4396baf0d338eec6f3bce3e2000da978" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -437,7 +446,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">const int* stp_sequence_get_int_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -471,11 +480,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of ints is stored in a pointer to int*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of ints is stored in a pointer to int*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="sequence.h::stp_sequence_get_long_data" ref="ga23" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="g864b55caa3a8c0e573031a36f57f7cc4"></a><!-- doxytag: member="sequence.h::stp_sequence_get_long_data" ref="g864b55caa3a8c0e573031a36f57f7cc4" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -483,7 +492,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">const long* stp_sequence_get_long_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -517,11 +526,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of longs is stored in a pointer to long*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of longs is stored in a pointer to long*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="sequence.h::stp_sequence_get_point" ref="ga14" args="(const stp_sequence_t *sequence, size_t where, double *data)" --><p>
+<a class="anchor" name="g044210129f28c298152ce124371324d4"></a><!-- doxytag: member="sequence.h::stp_sequence_get_point" ref="g044210129f28c298152ce124371324d4" args="(const stp_sequence_t *sequence, size_t where, double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -529,7 +538,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_get_point           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -570,11 +579,11 @@ Get the data at a single point in a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum is stored in the double pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="sequence.h::stp_sequence_get_range" ref="ga7" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
+<a class="anchor" name="gc2c70c539a3eced45be306d082faa3a6"></a><!-- doxytag: member="sequence.h::stp_sequence_get_range" ref="gc2c70c539a3eced45be306d082faa3a6" args="(const stp_sequence_t *sequence, double *low, double *high)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -582,7 +591,7 @@ Get the data at a single point in a sequence.
         <tr>
           <td class="md" nowrap valign="top">void stp_sequence_get_range           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -620,13 +629,13 @@ The values are stored in the variables pointed to by low and high. <dl compact><
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>sequence</em>&nbsp;</td><td>the sequence to work on. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>low</em>&nbsp;</td><td>a pointer to a double to store the low bound in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>a pointer to a double to store the high bound in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="sequence.h::stp_sequence_get_short_data" ref="ga27" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="g91a68efd6b99150739c7706f65703a2f"></a><!-- doxytag: member="sequence.h::stp_sequence_get_short_data" ref="g91a68efd6b99150739c7706f65703a2f" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -634,7 +643,7 @@ The values are stored in the variables pointed to by low and high. <dl compact><
         <tr>
           <td class="md" nowrap valign="top">const short* stp_sequence_get_short_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -668,11 +677,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of shorts is stored in a pointer to short*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of shorts is stored in a pointer to short*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="ga9" args="(const stp_sequence_t *sequence)" --><p>
+<a class="anchor" name="g99292c5ba10bcf1574c3e71a593c3e5f"></a><!-- doxytag: member="sequence.h::stp_sequence_get_size" ref="g99292c5ba10bcf1574c3e71a593c3e5f" args="(const stp_sequence_t *sequence)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -680,7 +689,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">size_t stp_sequence_get_size           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>sequence</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -699,11 +708,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
 <p>
 Get the sequence size. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the sequence size.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the sequence size. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="sequence.h::stp_sequence_get_uint_data" ref="ga26" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="g204f77e91c9283dc6ec6e742687bb0db"></a><!-- doxytag: member="sequence.h::stp_sequence_get_uint_data" ref="g204f77e91c9283dc6ec6e742687bb0db" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -711,7 +720,7 @@ Get the sequence size.
         <tr>
           <td class="md" nowrap valign="top">const unsigned int* stp_sequence_get_uint_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -745,11 +754,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned ints is stored in a pointer to unsigned int*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ulong_data" ref="ga24" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="gc4557b9fba98a7fbb4e17cc18fb0dded"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ulong_data" ref="gc4557b9fba98a7fbb4e17cc18fb0dded" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -757,7 +766,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">const unsigned long* stp_sequence_get_ulong_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -791,11 +800,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned longs is stored in a pointer to unsigned long*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ushort_data" ref="ga28" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
+<a class="anchor" name="g8bf46faeea891ac7ca699591df596bc1"></a><!-- doxytag: member="sequence.h::stp_sequence_get_ushort_data" ref="g8bf46faeea891ac7ca699591df596bc1" args="(const stp_sequence_t *sequence, size_t *count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -803,7 +812,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">const unsigned short* stp_sequence_get_ushort_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -837,11 +846,11 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
     <tr><td valign="top"></td><td valign="top"><em>count</em>&nbsp;</td><td>the number of elements in the sequence are stored in the size_t pointed to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the first element of an sequence of unsigned shorts is stored in a pointer to unsigned short*. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="sequence.h::stp_sequence_set_bounds" ref="ga5" args="(stp_sequence_t *sequence, double low, double high)" --><p>
+<a class="anchor" name="gd56df3112937c11431e033f2d9574b96"></a><!-- doxytag: member="sequence.h::stp_sequence_set_bounds" ref="gd56df3112937c11431e033f2d9574b96" args="(stp_sequence_t *sequence, double low, double high)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -849,7 +858,7 @@ The pointer returned is owned by the curve, and is not guaranteed to be valid be
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_bounds           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -890,11 +899,11 @@ The lower and upper bounds set the minimum and maximum values that a point in th
     <tr><td valign="top"></td><td valign="top"><em>high</em>&nbsp;</td><td>the upper bound. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if the lower bound is greater than the upper bound.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, or 0 if the lower bound is greater than the upper bound. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="sequence.h::stp_sequence_set_data" ref="ga10" args="(stp_sequence_t *sequence, size_t count, const double *data)" --><p>
+<a class="anchor" name="g24024e771a50db02f2713b244212603e"></a><!-- doxytag: member="sequence.h::stp_sequence_set_data" ref="g24024e771a50db02f2713b244212603e" args="(stp_sequence_t *sequence, size_t count, const double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -902,7 +911,7 @@ The lower and upper bounds set the minimum and maximum values that a point in th
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -943,11 +952,11 @@ Set the data in a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="sequence.h::stp_sequence_set_float_data" ref="ga15" args="(stp_sequence_t *sequence, size_t count, const float *data)" --><p>
+<a class="anchor" name="g34a526cb5e72b611ac8a98b559c24e2e"></a><!-- doxytag: member="sequence.h::stp_sequence_set_float_data" ref="g34a526cb5e72b611ac8a98b559c24e2e" args="(stp_sequence_t *sequence, size_t count, const float *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -955,7 +964,7 @@ Set the data in a sequence.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_float_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -996,11 +1005,11 @@ Set the data in a sequence from float values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="sequence.h::stp_sequence_set_int_data" ref="ga18" args="(stp_sequence_t *sequence, size_t count, const int *data)" --><p>
+<a class="anchor" name="gd4f058b2c690ad4e326970cc841d8f79"></a><!-- doxytag: member="sequence.h::stp_sequence_set_int_data" ref="gd4f058b2c690ad4e326970cc841d8f79" args="(stp_sequence_t *sequence, size_t count, const int *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1008,7 +1017,7 @@ Set the data in a sequence from float values.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_int_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1049,11 +1058,11 @@ Set the data in a sequence from int values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="sequence.h::stp_sequence_set_long_data" ref="ga16" args="(stp_sequence_t *sequence, size_t count, const long *data)" --><p>
+<a class="anchor" name="gd15e2cf350bb311da58f4b11240fa0f2"></a><!-- doxytag: member="sequence.h::stp_sequence_set_long_data" ref="gd15e2cf350bb311da58f4b11240fa0f2" args="(stp_sequence_t *sequence, size_t count, const long *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1061,7 +1070,7 @@ Set the data in a sequence from int values.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_long_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1102,11 +1111,11 @@ Set the data in a sequence from long values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="sequence.h::stp_sequence_set_point" ref="ga13" args="(stp_sequence_t *sequence, size_t where, double data)" --><p>
+<a class="anchor" name="gf7f49101192387e29399ded6d3166d13"></a><!-- doxytag: member="sequence.h::stp_sequence_set_point" ref="gf7f49101192387e29399ded6d3166d13" args="(stp_sequence_t *sequence, size_t where, double data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1114,7 +1123,7 @@ Set the data in a sequence from long values.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_point           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1155,11 +1164,11 @@ Set the data at a single point in a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>the datum to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="sequence.h::stp_sequence_set_short_data" ref="ga20" args="(stp_sequence_t *sequence, size_t count, const short *data)" --><p>
+<a class="anchor" name="ge0d6719f863a10422dea23e7f4b4dd29"></a><!-- doxytag: member="sequence.h::stp_sequence_set_short_data" ref="ge0d6719f863a10422dea23e7f4b4dd29" args="(stp_sequence_t *sequence, size_t count, const short *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1167,7 +1176,7 @@ Set the data at a single point in a sequence.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_short_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1208,11 +1217,11 @@ Set the data in a sequence from short values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="sequence.h::stp_sequence_set_size" ref="ga8" args="(stp_sequence_t *sequence, size_t size)" --><p>
+<a class="anchor" name="g166e9a610bd53cb812e328d9e111f240"></a><!-- doxytag: member="sequence.h::stp_sequence_set_size" ref="g166e9a610bd53cb812e328d9e111f240" args="(stp_sequence_t *sequence, size_t size)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1220,7 +1229,7 @@ Set the data in a sequence from short values.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_size           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1254,11 +1263,11 @@ The size is the number of elements the sequence contains. Note that resizing wil
     <tr><td valign="top"></td><td valign="top"><em>size</em>&nbsp;</td><td>the size to set the sequence to. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="sequence.h::stp_sequence_set_subrange" ref="ga11" args="(stp_sequence_t *sequence, size_t where, size_t size, const double *data)" --><p>
+<a class="anchor" name="g9b41ba7e0f1fb00cf19bbb9efe70824d"></a><!-- doxytag: member="sequence.h::stp_sequence_set_subrange" ref="g9b41ba7e0f1fb00cf19bbb9efe70824d" args="(stp_sequence_t *sequence, size_t where, size_t size, const double *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1266,7 +1275,7 @@ The size is the number of elements the sequence contains. Note that resizing wil
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_subrange           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1314,11 +1323,11 @@ Set the data in a subrange of a sequence.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="sequence.h::stp_sequence_set_uint_data" ref="ga19" args="(stp_sequence_t *sequence, size_t count, const unsigned int *data)" --><p>
+<a class="anchor" name="g40cd6256eb5bb72decd60edd1dc3be54"></a><!-- doxytag: member="sequence.h::stp_sequence_set_uint_data" ref="g40cd6256eb5bb72decd60edd1dc3be54" args="(stp_sequence_t *sequence, size_t count, const unsigned int *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1326,7 +1335,7 @@ Set the data in a subrange of a sequence.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_uint_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1367,11 +1376,11 @@ Set the data in a sequence from unsigned int values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ulong_data" ref="ga17" args="(stp_sequence_t *sequence, size_t count, const unsigned long *data)" --><p>
+<a class="anchor" name="gbc7ec322716d761436e4ad2d5d2f756f"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ulong_data" ref="gbc7ec322716d761436e4ad2d5d2f756f" args="(stp_sequence_t *sequence, size_t count, const unsigned long *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1379,7 +1388,7 @@ Set the data in a sequence from unsigned int values.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_ulong_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1420,11 +1429,11 @@ Set the data in a sequence from unsigned long values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ushort_data" ref="ga21" args="(stp_sequence_t *sequence, size_t count, const unsigned short *data)" --><p>
+<a class="anchor" name="g68aed44bbf6ede9ac49237091f2deb43"></a><!-- doxytag: member="sequence.h::stp_sequence_set_ushort_data" ref="g68aed44bbf6ede9ac49237091f2deb43" args="(stp_sequence_t *sequence, size_t count, const unsigned short *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1432,7 +1441,7 @@ Set the data in a sequence from unsigned long values.
         <tr>
           <td class="md" nowrap valign="top">int stp_sequence_set_ushort_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>sequence</em>, </td>
         </tr>
         <tr>
@@ -1473,12 +1482,12 @@ Set the data in a sequence from unsigned short values.
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to the first member of a sequence containing the data to set. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>1 on success, 0 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__util.html b/doc/gutenprint/html/group__util.html
index 093b384..803f27c 100644
--- a/doc/gutenprint/html/group__util.html
+++ b/doc/gutenprint/html/group__util.html
@@ -2,134 +2,143 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: util</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>util</h1>Utility functions.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga33">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9ef88b326f83d342849fa89c33c7e4a7">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga34">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3560e33ba80d2a0ceb07fe51fac845be">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga35">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g328a4b66d0767134649ce30b243931c9">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga36">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g8d8211f97675b37f18bff822757d04b3">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga37">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g30a9efd31b78debefd550d0b337ec795">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga38">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g158e1ea4acff071440681ba678b6fb0b">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0d6b1a8d780b3c5f970454678bc0323">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga40">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb8180ab505c2d7c5a717a53096ac770c">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga41">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc746369f247dc346bcbdeacb1abbdbcb">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga42">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb764d477ebf0db4957cc316badac70bd">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga43">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9c8f6255efb1fcf9cd3e7a68466e44ba">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga44">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gcb3d85de1088cf795cfeaa9e1450c4e0">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga45">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6d69d079a3d7a3e0e2b870e1e9417187">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga46">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb11ef5f0ed150be2d3b999b7fc7e4f24">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga47">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g08f48f3423e848f1932435c5f8e94ff7">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga48">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7bbbf3d31a1a4f6b0da808184e1c1587">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga49">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g51aee81a3d2a33d42417f6b61bb63f5e">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga50">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g52844a51058ca29f975b5666743622ac">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga51">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g4dc6609c9bb0c256fec7361f41a5c45f">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga52">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9eaf8d50f127cd4316bf68ad34092551">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga53">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc80b8553e636ec01fe4e975d9f7668b9">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga54">STP_SAFE_FREE</a>(x)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g44a234fbf1ab832399fc674c8cb53b1f">STP_SAFE_FREE</a>(x)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0">stp_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g69354e5830712093045a4ba290a298f8">stp_init</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1">stp_set_output_codeset</a> (const char *codeset)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="#g69354e5830712093045a4ba290a298f8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf7978ce9e414b3d8ad905ee36a51cfbd">stp_set_output_codeset</a> (const char *codeset)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="#gf7978ce9e414b3d8ad905ee36a51cfbd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g21168356d466d278f11dab2be8d0016e">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3">stp_abort</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9b6b2745ee2d68d1ca356a79c50f0ed7">stp_abort</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf64336e7c536a51d0debe88f1f5ec90a">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g18aaa3874e4dd5259a4d182fa8d9c90a">stp_zprintf</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9135d4c8cac78593aff55b668d09b79c">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf07e31a63021b4d504cc5a410e1aeb08">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g01199dc1d5a3db973d22cc9db00a4f41">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3c20beae37d9841e095b336d6f7dcc1d">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga10">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g0a445c531388afa31650ef4ccdac3ae1">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga11">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gbe0e31fbc0c4e6374903b25edc594f5e">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga12">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g0a59761c8a4ee5f31cfb9bec2a9b00b4">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13">stp_send_command</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g23ee64de1ec6ef5a4941ab80ba609840">stp_send_command</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga14">stp_erputc</a> (int ch)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g859b75eddde620338859121451096097">stp_erputc</a> (int ch)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g47c73485971132d9b41a33bdf572f670">stp_eprintf</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga16">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g5f6389ed7d500f851cabe8425a158e4b">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga17">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6bdd7099220fe310b228dcff5159b8d9">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga18">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g34d3ebda7c5b75ab40d1600f4d79a4be">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga19">stp_get_debug_level</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9ab4c35dd4b6e142281ff36ecedee27e">stp_get_debug_level</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga20">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g24e214e32810cc67c493c270a6ad83d6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga21">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf7bc1bd0ff92ca0f6ba7d0eb559e1da3">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga22">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g26a43ceec27ca34bc49f4806900b4618">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf39c22b74843750ca74a6caccb263c7c">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga24">stp_malloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7c76d059684ee6dc5bdc06e4b3af18ef">stp_malloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga25">stp_zalloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gae1d98650ef9777ae4f4b10eae60b5c9">stp_zalloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga26">stp_realloc</a> (void *ptr, size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g908f11aeabf31c8a9621bd65d408a5fc">stp_realloc</a> (void *ptr, size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga27">stp_free</a> (void *ptr)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabf89ff6213b9dc568fbdd1342b663ad">stp_free</a> (void *ptr)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga28">stp_strlen</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g054943d301baecba82cdb78b7e454880">stp_strlen</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga29">stp_strndup</a> (const char *s, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2c6b28a35780bfa7d03a2f8381ee82c2">stp_strndup</a> (const char *s, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga30">stp_strdup</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2f861f4a98ad496ca8cd995147867f32">stp_strdup</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31">stp_get_version</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g77022a2cfde3a9ba9269f1bc3726175c">stp_get_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga32">stp_get_release_version</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="#g77022a2cfde3a9ba9269f1bc3726175c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ged2a65d98cba1fd6d48c0cc1b611ae0f">stp_get_release_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="#ga32"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="#ged2a65d98cba1fd6d48c0cc1b611ae0f"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Utility functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga39"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="ga39" args="" --><p>
+<a class="anchor" name="ga0d6b1a8d780b3c5f970454678bc0323"></a><!-- doxytag: member="util.h::STP_DBG_CANON" ref="ga0d6b1a8d780b3c5f970454678bc0323" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -152,7 +161,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga34"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="ga34" args="" --><p>
+<a class="anchor" name="g3560e33ba80d2a0ceb07fe51fac845be"></a><!-- doxytag: member="util.h::STP_DBG_COLORFUNC" ref="g3560e33ba80d2a0ceb07fe51fac845be" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -175,7 +184,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga52"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="ga52" args="" --><p>
+<a class="anchor" name="g9eaf8d50f127cd4316bf68ad34092551"></a><!-- doxytag: member="util.h::STP_DBG_CURVE" ref="g9eaf8d50f127cd4316bf68ad34092551" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -198,7 +207,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga53"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="ga53" args="" --><p>
+<a class="anchor" name="gc80b8553e636ec01fe4e975d9f7668b9"></a><!-- doxytag: member="util.h::STP_DBG_CURVE_ERRORS" ref="gc80b8553e636ec01fe4e975d9f7668b9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -221,7 +230,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga38"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="ga38" args="" --><p>
+<a class="anchor" name="g158e1ea4acff071440681ba678b6fb0b"></a><!-- doxytag: member="util.h::STP_DBG_ESCP2" ref="g158e1ea4acff071440681ba678b6fb0b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -244,7 +253,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga35"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="ga35" args="" --><p>
+<a class="anchor" name="g328a4b66d0767134649ce30b243931c9"></a><!-- doxytag: member="util.h::STP_DBG_INK" ref="g328a4b66d0767134649ce30b243931c9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -267,7 +276,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga40"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="ga40" args="" --><p>
+<a class="anchor" name="gb8180ab505c2d7c5a717a53096ac770c"></a><!-- doxytag: member="util.h::STP_DBG_LEXMARK" ref="gb8180ab505c2d7c5a717a53096ac770c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -290,7 +299,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga44"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="ga44" args="" --><p>
+<a class="anchor" name="gcb3d85de1088cf795cfeaa9e1450c4e0"></a><!-- doxytag: member="util.h::STP_DBG_LIST" ref="gcb3d85de1088cf795cfeaa9e1450c4e0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -313,7 +322,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga33"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="ga33" args="" --><p>
+<a class="anchor" name="g9ef88b326f83d342849fa89c33c7e4a7"></a><!-- doxytag: member="util.h::STP_DBG_LUT" ref="g9ef88b326f83d342849fa89c33c7e4a7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -336,7 +345,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga43"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="ga43" args="" --><p>
+<a class="anchor" name="g9c8f6255efb1fcf9cd3e7a68466e44ba"></a><!-- doxytag: member="util.h::STP_DBG_MARK_FILE" ref="g9c8f6255efb1fcf9cd3e7a68466e44ba" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -359,7 +368,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga45"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="ga45" args="" --><p>
+<a class="anchor" name="g6d69d079a3d7a3e0e2b870e1e9417187"></a><!-- doxytag: member="util.h::STP_DBG_MODULE" ref="g6d69d079a3d7a3e0e2b870e1e9417187" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -382,7 +391,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga51"></a><!-- doxytag: member="util.h::STP_DBG_OLYMPUS" ref="ga51" args="" --><p>
+<a class="anchor" name="g4dc6609c9bb0c256fec7361f41a5c45f"></a><!-- doxytag: member="util.h::STP_DBG_OLYMPUS" ref="g4dc6609c9bb0c256fec7361f41a5c45f" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -405,7 +414,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga47"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="ga47" args="" --><p>
+<a class="anchor" name="g08f48f3423e848f1932435c5f8e94ff7"></a><!-- doxytag: member="util.h::STP_DBG_PAPER" ref="g08f48f3423e848f1932435c5f8e94ff7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -428,7 +437,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga46"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="ga46" args="" --><p>
+<a class="anchor" name="gb11ef5f0ed150be2d3b999b7fc7e4f24"></a><!-- doxytag: member="util.h::STP_DBG_PATH" ref="gb11ef5f0ed150be2d3b999b7fc7e4f24" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -451,7 +460,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga37"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="ga37" args="" --><p>
+<a class="anchor" name="g30a9efd31b78debefd550d0b337ec795"></a><!-- doxytag: member="util.h::STP_DBG_PCL" ref="g30a9efd31b78debefd550d0b337ec795" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -474,7 +483,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga48"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="ga48" args="" --><p>
+<a class="anchor" name="g7bbbf3d31a1a4f6b0da808184e1c1587"></a><!-- doxytag: member="util.h::STP_DBG_PRINTERS" ref="g7bbbf3d31a1a4f6b0da808184e1c1587" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -497,7 +506,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga36"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="ga36" args="" --><p>
+<a class="anchor" name="g8d8211f97675b37f18bff822757d04b3"></a><!-- doxytag: member="util.h::STP_DBG_PS" ref="g8d8211f97675b37f18bff822757d04b3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -520,7 +529,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga42"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="ga42" args="" --><p>
+<a class="anchor" name="gb764d477ebf0db4957cc316badac70bd"></a><!-- doxytag: member="util.h::STP_DBG_ROWS" ref="gb764d477ebf0db4957cc316badac70bd" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -543,7 +552,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga50"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="ga50" args="" --><p>
+<a class="anchor" name="g52844a51058ca29f975b5666743622ac"></a><!-- doxytag: member="util.h::STP_DBG_VARS" ref="g52844a51058ca29f975b5666743622ac" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -566,7 +575,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga41"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="ga41" args="" --><p>
+<a class="anchor" name="gc746369f247dc346bcbdeacb1abbdbcb"></a><!-- doxytag: member="util.h::STP_DBG_WEAVE_PARAMS" ref="gc746369f247dc346bcbdeacb1abbdbcb" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -589,7 +598,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga49"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="ga49" args="" --><p>
+<a class="anchor" name="g51aee81a3d2a33d42417f6b61bb63f5e"></a><!-- doxytag: member="util.h::STP_DBG_XML" ref="g51aee81a3d2a33d42417f6b61bb63f5e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -612,7 +621,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga54"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="ga54" args="(x)" --><p>
+<a class="anchor" name="g44a234fbf1ab832399fc674c8cb53b1f"></a><!-- doxytag: member="util.h::STP_SAFE_FREE" ref="g44a234fbf1ab832399fc674c8cb53b1f" args="(x)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -640,14 +649,14 @@ Utility functions.
 <b>Value:</b><div class="fragment"><pre class="fragment"><span class="keywordflow">do</span>                                              \
 {                                               \
   <span class="keywordflow">if</span> ((x))                                      \
-    <a class="code" href="group__util.html#ga27">stp_free</a>((<span class="keywordtype">char</span> *)(x));                      \
+    <a class="code" href="group__util.html#gabf89ff6213b9dc568fbdd1342b663ad">stp_free</a>((<span class="keywordtype">char</span> *)(x));                      \
   ((x)) = NULL;                                 \
 } <span class="keywordflow">while</span> (0)
 </pre></div>    </td>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="util.h::stp_abort" ref="ga3" args="(void)" --><p>
+<a class="anchor" name="g9b6b2745ee2d68d1ca356a79c50f0ed7"></a><!-- doxytag: member="util.h::stp_abort" ref="g9b6b2745ee2d68d1ca356a79c50f0ed7" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -675,7 +684,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="util.h::stp_asprintf" ref="ga17" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="g6bdd7099220fe310b228dcff5159b8d9"></a><!-- doxytag: member="util.h::stp_asprintf" ref="g6bdd7099220fe310b228dcff5159b8d9" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -718,7 +727,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="util.h::stp_catprintf" ref="ga18" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="g34d3ebda7c5b75ab40d1600f4d79a4be"></a><!-- doxytag: member="util.h::stp_catprintf" ref="g34d3ebda7c5b75ab40d1600f4d79a4be" args="(char **strp, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -761,7 +770,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="util.h::stp_deprintf" ref="ga21" args="(unsigned long level, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="gf7bc1bd0ff92ca0f6ba7d0eb559e1da3"></a><!-- doxytag: member="util.h::stp_deprintf" ref="gf7bc1bd0ff92ca0f6ba7d0eb559e1da3" args="(unsigned long level, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -804,7 +813,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="util.h::stp_dprintf" ref="ga20" args="(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="g24e214e32810cc67c493c270a6ad83d6"></a><!-- doxytag: member="util.h::stp_dprintf" ref="g24e214e32810cc67c493c270a6ad83d6" args="(unsigned long level, const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -818,7 +827,7 @@ Utility functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -853,7 +862,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="util.h::stp_eprintf" ref="ga15" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="g47c73485971132d9b41a33bdf572f670"></a><!-- doxytag: member="util.h::stp_eprintf" ref="g47c73485971132d9b41a33bdf572f670" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -861,7 +870,7 @@ Utility functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_eprintf           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -896,7 +905,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="util.h::stp_erprintf" ref="ga16" args="(const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="g5f6389ed7d500f851cabe8425a158e4b"></a><!-- doxytag: member="util.h::stp_erprintf" ref="g5f6389ed7d500f851cabe8425a158e4b" args="(const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -933,7 +942,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="util.h::stp_erputc" ref="ga14" args="(int ch)" --><p>
+<a class="anchor" name="g859b75eddde620338859121451096097"></a><!-- doxytag: member="util.h::stp_erputc" ref="g859b75eddde620338859121451096097" args="(int ch)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -961,7 +970,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="ga23" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="gf39c22b74843750ca74a6caccb263c7c"></a><!-- doxytag: member="util.h::stp_flush_debug_messages" ref="gf39c22b74843750ca74a6caccb263c7c" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -969,7 +978,7 @@ Utility functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_flush_debug_messages           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -989,7 +998,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="util.h::stp_free" ref="ga27" args="(void *ptr)" --><p>
+<a class="anchor" name="gabf89ff6213b9dc568fbdd1342b663ad"></a><!-- doxytag: member="util.h::stp_free" ref="gabf89ff6213b9dc568fbdd1342b663ad" args="(void *ptr)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1017,7 +1026,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="ga19" args="(void)" --><p>
+<a class="anchor" name="g9ab4c35dd4b6e142281ff36ecedee27e"></a><!-- doxytag: member="util.h::stp_get_debug_level" ref="g9ab4c35dd4b6e142281ff36ecedee27e" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1045,7 +1054,7 @@ Utility functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga32"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="ga32" args="(void)" --><p>
+<a class="anchor" name="ged2a65d98cba1fd6d48c0cc1b611ae0f"></a><!-- doxytag: member="util.h::stp_get_release_version" ref="ged2a65d98cba1fd6d48c0cc1b611ae0f" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1072,11 +1081,11 @@ Utility functions.
 <p>
 Get the library release version string (x.y). 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the release name of the package, which must not be modified or freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the release name of the package, which must not be modified or freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="util.h::stp_get_version" ref="ga31" args="(void)" --><p>
+<a class="anchor" name="g77022a2cfde3a9ba9269f1bc3726175c"></a><!-- doxytag: member="util.h::stp_get_version" ref="g77022a2cfde3a9ba9269f1bc3726175c" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1103,11 +1112,11 @@ Get the library release version string (x.y).
 <p>
 Get the library version string (x.y.z). 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the version name of the package, which must not be modified or freed.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the version name of the package, which must not be modified or freed. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="util.h::stp_init" ref="ga0" args="(void)" --><p>
+<a class="anchor" name="g69354e5830712093045a4ba290a298f8"></a><!-- doxytag: member="util.h::stp_init" ref="g69354e5830712093045a4ba290a298f8" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1134,11 +1143,11 @@ Get the library version string (x.y.z).
 <p>
 Initialise libgimpprint. 
 <p>
-This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures. <dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure.</dd></dl>
+This function must be called prior to any other use of the library. It is responsible for loading modules and XML data and initialising internal data structures. <dl compact><dt><b>Returns:</b></dt><dd>0 on success, 1 on failure. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="ga22" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="g26a43ceec27ca34bc49f4806900b4618"></a><!-- doxytag: member="util.h::stp_init_debug_messages" ref="g26a43ceec27ca34bc49f4806900b4618" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1146,7 +1155,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap valign="top">void void void stp_init_debug_messages           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1166,7 +1175,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="util.h::stp_malloc" ref="ga24" args="(size_t)" --><p>
+<a class="anchor" name="g7c76d059684ee6dc5bdc06e4b3af18ef"></a><!-- doxytag: member="util.h::stp_malloc" ref="g7c76d059684ee6dc5bdc06e4b3af18ef" args="(size_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1194,7 +1203,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="ga4" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="gf64336e7c536a51d0debe88f1f5ec90a"></a><!-- doxytag: member="util.h::stp_prune_inactive_options" ref="gf64336e7c536a51d0debe88f1f5ec90a" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1202,7 +1211,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap valign="top">void stp_prune_inactive_options           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1222,7 +1231,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="util.h::stp_put16_be" ref="ga9" args="(unsigned short sh, const stp_vars_t *v)" --><p>
+<a class="anchor" name="g3c20beae37d9841e095b336d6f7dcc1d"></a><!-- doxytag: member="util.h::stp_put16_be" ref="g3c20beae37d9841e095b336d6f7dcc1d" args="(unsigned short sh, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1236,7 +1245,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1259,7 +1268,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="util.h::stp_put16_le" ref="ga8" args="(unsigned short sh, const stp_vars_t *v)" --><p>
+<a class="anchor" name="g01199dc1d5a3db973d22cc9db00a4f41"></a><!-- doxytag: member="util.h::stp_put16_le" ref="g01199dc1d5a3db973d22cc9db00a4f41" args="(unsigned short sh, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1273,7 +1282,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1296,7 +1305,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="util.h::stp_put32_be" ref="ga11" args="(unsigned int sh, const stp_vars_t *v)" --><p>
+<a class="anchor" name="gbe0e31fbc0c4e6374903b25edc594f5e"></a><!-- doxytag: member="util.h::stp_put32_be" ref="gbe0e31fbc0c4e6374903b25edc594f5e" args="(unsigned int sh, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1310,7 +1319,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1333,7 +1342,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="util.h::stp_put32_le" ref="ga10" args="(unsigned int sh, const stp_vars_t *v)" --><p>
+<a class="anchor" name="g0a445c531388afa31650ef4ccdac3ae1"></a><!-- doxytag: member="util.h::stp_put32_le" ref="g0a445c531388afa31650ef4ccdac3ae1" args="(unsigned int sh, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1347,7 +1356,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1370,7 +1379,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="util.h::stp_putc" ref="ga7" args="(int ch, const stp_vars_t *v)" --><p>
+<a class="anchor" name="gf07e31a63021b4d504cc5a410e1aeb08"></a><!-- doxytag: member="util.h::stp_putc" ref="gf07e31a63021b4d504cc5a410e1aeb08" args="(int ch, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1384,7 +1393,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1407,7 +1416,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="util.h::stp_puts" ref="ga12" args="(const char *s, const stp_vars_t *v)" --><p>
+<a class="anchor" name="g0a59761c8a4ee5f31cfb9bec2a9b00b4"></a><!-- doxytag: member="util.h::stp_puts" ref="g0a59761c8a4ee5f31cfb9bec2a9b00b4" args="(const char *s, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1421,7 +1430,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1444,13 +1453,13 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="util.h::stp_read_and_compose_curves" ref="ga2" args="(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)" --><p>
+<a class="anchor" name="g21168356d466d278f11dab2be8d0016e"></a><!-- doxytag: member="util.h::stp_read_and_compose_curves" ref="g21168356d466d278f11dab2be8d0016e" args="(const char *s1, const char *s2, stp_curve_compose_t comp, size_t piecewise_point_count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_read_and_compose_curves           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_read_and_compose_curves           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const char *&nbsp;</td>
           <td class="mdname" nowrap> <em>s1</em>, </td>
@@ -1464,7 +1473,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>comp</em>, </td>
         </tr>
         <tr>
@@ -1493,7 +1502,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="util.h::stp_realloc" ref="ga26" args="(void *ptr, size_t)" --><p>
+<a class="anchor" name="g908f11aeabf31c8a9621bd65d408a5fc"></a><!-- doxytag: member="util.h::stp_realloc" ref="g908f11aeabf31c8a9621bd65d408a5fc" args="(void *ptr, size_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1530,7 +1539,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="util.h::stp_send_command" ref="ga13" args="(const stp_vars_t *v, const char *command, const char *format,...)" --><p>
+<a class="anchor" name="g23ee64de1ec6ef5a4941ab80ba609840"></a><!-- doxytag: member="util.h::stp_send_command" ref="g23ee64de1ec6ef5a4941ab80ba609840" args="(const stp_vars_t *v, const char *command, const char *format,...)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1538,7 +1547,7 @@ This function must be called prior to any other use of the library. It is respon
         <tr>
           <td class="md" nowrap valign="top">void stp_send_command           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1579,7 +1588,7 @@ This function must be called prior to any other use of the library. It is respon
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="ga1" args="(const char *codeset)" --><p>
+<a class="anchor" name="gf7978ce9e414b3d8ad905ee36a51cfbd"></a><!-- doxytag: member="util.h::stp_set_output_codeset" ref="gf7978ce9e414b3d8ad905ee36a51cfbd" args="(const char *codeset)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1611,11 +1620,11 @@ This function sets the encoding that all strings translated by gettext are outpu
     <tr><td valign="top"></td><td valign="top"><em>codeset</em>&nbsp;</td><td>the standard name of the encoding, which must be usable with iconv_open(). For example, "US-ASCII" or "UTF-8". If NULL, the currently-selected codeset will be returned (or NULL if no codeset has been selected yet). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a string containing the selected codeset, or NULL on failure (errno is set accordingly).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a string containing the selected codeset, or NULL on failure (errno is set accordingly). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="util.h::stp_strdup" ref="ga30" args="(const char *s)" --><p>
+<a class="anchor" name="g2f861f4a98ad496ca8cd995147867f32"></a><!-- doxytag: member="util.h::stp_strdup" ref="g2f861f4a98ad496ca8cd995147867f32" args="(const char *s)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1643,7 +1652,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="util.h::stp_strlen" ref="ga28" args="(const char *s)" --><p>
+<a class="anchor" name="g054943d301baecba82cdb78b7e454880"></a><!-- doxytag: member="util.h::stp_strlen" ref="g054943d301baecba82cdb78b7e454880" args="(const char *s)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1671,7 +1680,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="util.h::stp_strndup" ref="ga29" args="(const char *s, int n)" --><p>
+<a class="anchor" name="g2c6b28a35780bfa7d03a2f8381ee82c2"></a><!-- doxytag: member="util.h::stp_strndup" ref="g2c6b28a35780bfa7d03a2f8381ee82c2" args="(const char *s, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1708,7 +1717,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="util.h::stp_zalloc" ref="ga25" args="(size_t)" --><p>
+<a class="anchor" name="gae1d98650ef9777ae4f4b10eae60b5c9"></a><!-- doxytag: member="util.h::stp_zalloc" ref="gae1d98650ef9777ae4f4b10eae60b5c9" args="(size_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1736,7 +1745,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="util.h::stp_zfwrite" ref="ga6" args="(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)" --><p>
+<a class="anchor" name="g9135d4c8cac78593aff55b668d09b79c"></a><!-- doxytag: member="util.h::stp_zfwrite" ref="g9135d4c8cac78593aff55b668d09b79c" args="(const char *buf, size_t bytes, size_t nitems, const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1762,7 +1771,7 @@ This function sets the encoding that all strings translated by gettext are outpu
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em></td>
         </tr>
         <tr>
@@ -1785,7 +1794,7 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="util.h::stp_zprintf" ref="ga5" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
+<a class="anchor" name="g18aaa3874e4dd5259a4d182fa8d9c90a"></a><!-- doxytag: member="util.h::stp_zprintf" ref="g18aaa3874e4dd5259a4d182fa8d9c90a" args="(const stp_vars_t *v, const char *format,...) __attribute__((format(__printf__" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1793,7 +1802,7 @@ This function sets the encoding that all strings translated by gettext are outpu
         <tr>
           <td class="md" nowrap valign="top">void stp_zprintf           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1828,8 +1837,8 @@ This function sets the encoding that all strings translated by gettext are outpu
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__vars.html b/doc/gutenprint/html/group__vars.html
index e1f13d3..8e9b48d 100644
--- a/doc/gutenprint/html/group__vars.html
+++ b/doc/gutenprint/html/group__vars.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: vars</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>vars</h1>The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
@@ -22,457 +31,457 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0">stp_vars_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="#gde33aeed00b53e4af71ee1f7c4326279"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="#gb264246d4b7e584447b5f39ed8f7ee05"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="#g73ac4d52cb5cecbb9694e9038fb7ea82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="#gd11be815334025415a8e2023e0cd44c5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a> )(void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> )(void *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a> )(void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">compdata_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
-<a class="el" href="group__vars.html#gga132a8">STP_PARAMETER_TYPE_INT</a>, 
-<a class="el" href="group__vars.html#gga132a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
-<a class="el" href="group__vars.html#gga132a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_type_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2">STP_PARAMETER_TYPE_STRING_LIST</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4">STP_PARAMETER_TYPE_INT</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d">STP_PARAMETER_TYPE_BOOLEAN</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81">STP_PARAMETER_TYPE_DOUBLE</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a11">STP_PARAMETER_TYPE_CURVE</a>, 
-<a class="el" href="group__vars.html#gga132a12">STP_PARAMETER_TYPE_FILE</a>, 
-<a class="el" href="group__vars.html#gga132a13">STP_PARAMETER_TYPE_RAW</a>, 
-<a class="el" href="group__vars.html#gga132a14">STP_PARAMETER_TYPE_ARRAY</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e">STP_PARAMETER_TYPE_CURVE</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6">STP_PARAMETER_TYPE_FILE</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372">STP_PARAMETER_TYPE_RAW</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d">STP_PARAMETER_TYPE_ARRAY</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
-<a class="el" href="group__vars.html#gga132a16">STP_PARAMETER_TYPE_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7">STP_PARAMETER_TYPE_DIMENSION</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576">STP_PARAMETER_TYPE_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga132">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga133a17">STP_PARAMETER_CLASS_FEATURE</a>, 
-<a class="el" href="group__vars.html#gga133a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
-<a class="el" href="group__vars.html#gga133a19">STP_PARAMETER_CLASS_CORE</a>, 
-<a class="el" href="group__vars.html#gga133a20">STP_PARAMETER_CLASS_INVALID</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11">STP_PARAMETER_CLASS_FEATURE</a>, 
+<a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a">STP_PARAMETER_CLASS_OUTPUT</a>, 
+<a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9">STP_PARAMETER_CLASS_CORE</a>, 
+<a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a21">STP_PARAMETER_LEVEL_BASIC</a>, 
-<a class="el" href="group__vars.html#gga134a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
-<a class="el" href="group__vars.html#gga134a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
-<a class="el" href="group__vars.html#gga134a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_level_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca">STP_PARAMETER_LEVEL_BASIC</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc">STP_PARAMETER_LEVEL_ADVANCED</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
-<a class="el" href="group__vars.html#gga134a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
-<a class="el" href="group__vars.html#gga134a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
-<a class="el" href="group__vars.html#gga134a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd">STP_PARAMETER_LEVEL_INTERNAL</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a29">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga135a30">STP_PARAMETER_INACTIVE</a>, 
-<a class="el" href="group__vars.html#gga135a31">STP_PARAMETER_DEFAULTED</a>, 
-<a class="el" href="group__vars.html#gga135a32">STP_PARAMETER_ACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab">STP_PARAMETER_INACTIVE</a>, 
+<a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136">STP_PARAMETER_DEFAULTED</a>, 
+<a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga136a33">PARAMETER_BAD</a>, 
-<a class="el" href="group__vars.html#gga136a34">PARAMETER_OK</a>, 
-<a class="el" href="group__vars.html#gga136a35">PARAMETER_INACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25">PARAMETER_BAD</a>, 
+<a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333">PARAMETER_OK</a>, 
+<a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9">PARAMETER_INACTIVE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7">stp_vars_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a">stp_vars_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="#gae35d353b6f86b1cbb97bb0b271f5c9a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g165ae58fed1515b5466ab1b84df85a86">stp_vars_copy</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="#g165ae58fed1515b5466ab1b84df85a86"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c6d765cc5a27b322289e9baa9d97098">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga10">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="#g3c6d765cc5a27b322289e9baa9d97098"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g78259fcaa881655a07ef0b2b457bdf70">stp_vars_destroy</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11">stp_set_driver</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="#g78259fcaa881655a07ef0b2b457bdf70"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8d9dbb1e613cfe2b119668158e35a76">stp_set_driver</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga8d9dbb1e613cfe2b119668158e35a76"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge303a6ed77135b691ebbfd56cb577531">stp_set_driver_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga13">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="#ge303a6ed77135b691ebbfd56cb577531"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcf8efdb6fd9847e41c85f9491a252f01">stp_get_driver</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga14">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="#gcf8efdb6fd9847e41c85f9491a252f01"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g335e7eb264fa22343765146fb2318b31">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga15">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#g335e7eb264fa22343765146fb2318b31"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3164aa99994dabb561d6c295eb647123">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="#g3164aa99994dabb561d6c295eb647123"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g087136342c500c138d73dbe0e2aad11a">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga17">stp_set_left</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="#g087136342c500c138d73dbe0e2aad11a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5d675ab9877df60ec467a20a0d62fcbc">stp_set_left</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga18">stp_get_left</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="#g5d675ab9877df60ec467a20a0d62fcbc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd3fbd778898c2b0fba19d0937fb939f5">stp_get_left</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga19">stp_set_top</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="#gd3fbd778898c2b0fba19d0937fb939f5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa76e04fcde3aa6c162fb9d2fcaca251">stp_set_top</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20">stp_get_top</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="#gaa76e04fcde3aa6c162fb9d2fcaca251"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcda38fc8e26a75c2b5d246b4341a8fd3">stp_get_top</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga21">stp_set_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="#gcda38fc8e26a75c2b5d246b4341a8fd3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdbdd8bad1742e87b5c5a299c2ebf7cf4">stp_set_width</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga22">stp_get_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="#gdbdd8bad1742e87b5c5a299c2ebf7cf4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1">stp_get_width</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23">stp_set_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="#g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g68110f6d19b3987f6f66baee3926eb89">stp_set_height</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga24">stp_get_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="#g68110f6d19b3987f6f66baee3926eb89"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7623276e130cb684670ecb153300ebaf">stp_get_height</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="#g7623276e130cb684670ecb153300ebaf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g751759cdeb8feb061c00f35d37fea45c">stp_set_page_width</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga26">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="#g751759cdeb8feb061c00f35d37fea45c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gea14f3cad139fc5b8d547a252deacff3">stp_get_page_width</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="#gea14f3cad139fc5b8d547a252deacff3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g775714bf75f1fdbdd895f59edc9eca55">stp_set_page_height</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="#g775714bf75f1fdbdd895f59edc9eca55"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g94d8cf912e3b036f67bc2d4c37d733ff">stp_get_page_height</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga29">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="#g94d8cf912e3b036f67bc2d4c37d733ff"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g30d5438686c8ead9a092f98bf3c3d8ca">stp_set_outfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga30">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="#g30d5438686c8ead9a092f98bf3c3d8ca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g095834813ebbe8985d443e1fa78a0b98">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#g095834813ebbe8985d443e1fa78a0b98"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge89d8eb48e4a7a8107b87a44a4318064">stp_set_errfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga32">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="#ge89d8eb48e4a7a8107b87a44a4318064"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fe5b4efdfaa3e79918dd5079e61e2c5">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga33">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="#g9fe5b4efdfaa3e79918dd5079e61e2c5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8fef23ae01a368f4d16ad95813d97d6d">stp_set_outdata</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga34">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="#g8fef23ae01a368f4d16ad95813d97d6d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g54e35f94578f346c07718587f18b049c">stp_get_outdata</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga35">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="#g54e35f94578f346c07718587f18b049c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7a006418c4dbb265be71f7b5a202455d">stp_set_errdata</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga36">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="#g7a006418c4dbb265be71f7b5a202455d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge66b9c64f5821ee6e95f4b9e18cadd4e">stp_get_errdata</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga37">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *print)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="#ge66b9c64f5821ee6e95f4b9e18cadd4e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc970fc314c6418d9193d93c787b908d9">stp_merge_printvars</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *print)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga38">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="#gc970fc314c6418d9193d93c787b908d9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g955b215a88b868cfc74d7a340de9b8f6">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga39">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="#g955b215a88b868cfc74d7a340de9b8f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf69f651a798e9f06c67baf06f0754228">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="#gf69f651a798e9f06c67baf06f0754228"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3dea1f995d40482b9f6470fedd994f95">stp_parameter_find</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga41">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="#g3dea1f995d40482b9f6470fedd994f95"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g96fc73864dfc00ae418f14a81c72be26">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="#g96fc73864dfc00ae418f14a81c72be26"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd0f6c2b153638f551d7709780eb7276a">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga43">stp_parameter_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="#gd0f6c2b153638f551d7709780eb7276a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c1ddd3c10c367c0912fdd841576278f">stp_parameter_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga44">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="#g3c1ddd3c10c367c0912fdd841576278f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8dc4ff543dbc1882d673b25234088b6">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="#ga8dc4ff543dbc1882d673b25234088b6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g62c6225b0721d5c80d889edc307f0b6b">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga46">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> append)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="#g62c6225b0721d5c80d889edc307f0b6b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf8aa1d7aba11de5fdee95b9cb339be61">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> append)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="#ga46"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="#gf8aa1d7aba11de5fdee95b9cb339be61"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ged453c314365a3948b195e3175455a12">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="#ga47"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga48">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="#ged453c314365a3948b195e3175455a12"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc5a3eb0348d31acf60772265c3896542">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="#ga48"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="#gc5a3eb0348d31acf60772265c3896542"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g711cf3e5e52fd3434ef7a9d16654aea8">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="#ga49"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga50">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="#g711cf3e5e52fd3434ef7a9d16654aea8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g22338d64a871a8b279fdee6fd83fff7f">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#ga50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga51">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#g22338d64a871a8b279fdee6fd83fff7f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5182246d4e0653f73dfaa40b62d4285f">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#ga51"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga52">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="#g5182246d4e0653f73dfaa40b62d4285f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8134e4dc36b063a7d7dd229b9df32726">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#ga52"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#g8134e4dc36b063a7d7dd229b9df32726"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6e6c5474c253a452073eba25251a1481">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#ga53"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga54">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="#g6e6c5474c253a452073eba25251a1481"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g82f7bbcf639c60678c1dc2aee24e8a24">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="#ga54"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga55">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="#g82f7bbcf639c60678c1dc2aee24e8a24"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8c6cd5f3bb3ab59a4f06c020c062c13e">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="#ga55"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga56">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="#g8c6cd5f3bb3ab59a4f06c020c062c13e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g778b0e43aad1e011012b8071b469c694">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="#ga56"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga57">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="#g778b0e43aad1e011012b8071b469c694"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8f67ed7dcee969e77374fb4daf468d58">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="#ga57"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga58">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="#g8f67ed7dcee969e77374fb4daf468d58"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5f4adaadb80cd2d94569881d96cfa02e">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="#ga58"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga59">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="#g5f4adaadb80cd2d94569881d96cfa02e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1f63514f8ffd8ea56f0beee69398ee01">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="#ga59"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="#g1f63514f8ffd8ea56f0beee69398ee01"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd40038a74fa7548da5fcaec6687c8787">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="#ga60"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga61">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="#gd40038a74fa7548da5fcaec6687c8787"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gec605c647cab13d61ab5e2822d9f7ead">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="#ga61"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga62">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="#gec605c647cab13d61ab5e2822d9f7ead"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g71306c3e3118d9a4545b0a3cefb863ea">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#ga62"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#g71306c3e3118d9a4545b0a3cefb863ea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g65b18994af3384af04e2bf77e288f54f">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#ga63"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga64">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="#g65b18994af3384af04e2bf77e288f54f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae28e4c640fba005a72e92af66327b50">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#ga64"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga65">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#gae28e4c640fba005a72e92af66327b50"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdeae102d1bd65147221f56e6095f35ef">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#ga65"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga66">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="#gdeae102d1bd65147221f56e6095f35ef"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g59b79c779211a72de534fb9e61548f97">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="#ga66"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="#g59b79c779211a72de534fb9e61548f97"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gbf1d9c938d364598414e9f15c41c1f08">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="#ga67"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga68">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="#gbf1d9c938d364598414e9f15c41c1f08"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g18b8a4fb414245d2c30df9ee11057845">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="#ga68"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga69">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="#g18b8a4fb414245d2c30df9ee11057845"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd286782f691998858e30a202506bad74">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="#ga69"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="#gd286782f691998858e30a202506bad74"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdd7769bfece8597cde869eced1239a1e">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="#ga70"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga71">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="#gdd7769bfece8597cde869eced1239a1e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1620e4be3c7fb85262802338d3143f6">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="#ga71"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga72">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="#ga1620e4be3c7fb85262802338d3143f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf95184ecee86a92db2a7d3f050154a46">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="#ga72"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga73">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="#gf95184ecee86a92db2a7d3f050154a46"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga59b141facb320c409d9071f469fdbc5">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="#ga73"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga74">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="#ga59b141facb320c409d9071f469fdbc5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5efb45e6883a2522fd7e78c6eb761c79">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="#ga74"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga75">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="#g5efb45e6883a2522fd7e78c6eb761c79"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g46195f69cc57bd18a4cde5756dd84601">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="#ga75"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="#g46195f69cc57bd18a4cde5756dd84601"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g22bc2b8307fb6a95dac7fcf3d35bf6b9">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="#ga76"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga77">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="#g22bc2b8307fb6a95dac7fcf3d35bf6b9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb4121cba599314c929d04cce0e850473">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="#ga77"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga78">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="#gb4121cba599314c929d04cce0e850473"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4cc8b69619067f882035cca46e9ce0cd">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="#ga78"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga79">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="#g4cc8b69619067f882035cca46e9ce0cd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1a5a2746548465d681d00c6301a26100">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="#ga79"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga80">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="#g1a5a2746548465d681d00c6301a26100"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb918206f9b70fff5d58a16a762295981">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="#ga80"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="#gb918206f9b70fff5d58a16a762295981"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9f4db93fc31ad52018bc3ad14b58bfc2">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="#ga81"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="#g9f4db93fc31ad52018bc3ad14b58bfc2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc7fe8cd335309d755fe5b54bf6b8e5a3">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="#ga82"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="#gc7fe8cd335309d755fe5b54bf6b8e5a3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7acde85eb361525f5cf481bafddbc1bd">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="#ga83"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga84">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="#g7acde85eb361525f5cf481bafddbc1bd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g740a5cab681f30b8cc5e4ca18197e472">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="#ga84"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga85">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="#g740a5cab681f30b8cc5e4ca18197e472"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4841e9250e4c7f38f2267355402ffcc1">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="#ga85"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga86">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="#g4841e9250e4c7f38f2267355402ffcc1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g28203d9250f232f9af290802cf2db881">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="#ga86"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga87">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="#g28203d9250f232f9af290802cf2db881"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge5b7e3356b3c1c893620fdeeea486e48">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="#ga87"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="#ge5b7e3356b3c1c893620fdeeea486e48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9e992f880bd74cd4097527a39aea7125">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="#ga88"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga89">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="#g9e992f880bd74cd4097527a39aea7125"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb9df68cbf9973203adfca5e1293b300a">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="#ga89"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga90">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="#gb9df68cbf9973203adfca5e1293b300a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga79b051578077beca548be224062705c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="#ga90"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="#ga79b051578077beca548be224062705c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g44793f2cf64b11917b8943d20ee43b9d">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#ga91"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="#g44793f2cf64b11917b8943d20ee43b9d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8c04ab4487623a41e0b2600d466a88ad">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#ga92"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="#g8c04ab4487623a41e0b2600d466a88ad"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g38a95079fd6f90a0c6a92c5ddeb104ca">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#ga93"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="#g38a95079fd6f90a0c6a92c5ddeb104ca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1c724bc85737bf8c698a08bc2d441b3e">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#ga94"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="#g1c724bc85737bf8c698a08bc2d441b3e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6fa1953ee96051566a261f3391da3857">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#ga95"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="#g6fa1953ee96051566a261f3391da3857"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge12a7edf773cbe04fb98b171ba2c2fb9">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#ga96"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="#ge12a7edf773cbe04fb98b171ba2c2fb9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g160150a3a39d66f5a807d1c750a57890">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#ga97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="#g160150a3a39d66f5a807d1c750a57890"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf2aada3c00f9b00bc6a65014da87e250">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#ga98"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="#gf2aada3c00f9b00bc6a65014da87e250"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fe388535a67f8360ab21f58233c0e17">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#ga99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="#g9fe388535a67f8360ab21f58233c0e17"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae6b21f76f675516e9189c47444e17cf">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#ga100"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="#gae6b21f76f675516e9189c47444e17cf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb411dae8fb16ec9f289d4f2f1ecabcfc">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#ga101"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="#gb411dae8fb16ec9f289d4f2f1ecabcfc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2deea3612965e28cd0d513c5850ca074">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#ga102"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="#g2deea3612965e28cd0d513c5850ca074"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g056b021334fe812aa14bbbfd60aafba8">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#ga103"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="#g056b021334fe812aa14bbbfd60aafba8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcdfa2f747081721c03b10484a832a535">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#ga104"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="#gcdfa2f747081721c03b10484a832a535"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadfd66825dd58fb8e0851d493445c4e4">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#ga105"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="#gadfd66825dd58fb8e0851d493445c4e4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#geecfc1f1fdc97ea165ae35b64de95178">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#ga106"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="#geecfc1f1fdc97ea165ae35b64de95178"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdf6c305c48d012bc138db025c9bd63df">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#ga107"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="#gdf6c305c48d012bc138db025c9bd63df"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5bd30b408d6ec16b3999dce5e540a5fa">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#ga108"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="#g5bd30b408d6ec16b3999dce5e540a5fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gda8dd20ab17a9b403c68b4cd86fb529c">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#ga109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="#gda8dd20ab17a9b403c68b4cd86fb529c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0f09e85b570ffee4a4d94853bb22bcb3">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#ga110"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="#g0f09e85b570ffee4a4d94853bb22bcb3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g28d01beda4b54cec395654847dbbc301">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#ga111"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="#g28d01beda4b54cec395654847dbbc301"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac76d8e06c3ce3fb0f27c0c80d6ad5fc">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#ga112"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="#gac76d8e06c3ce3fb0f27c0c80d6ad5fc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8125d08f90002e654f2e45427e2f0251">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#ga113"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="#g8125d08f90002e654f2e45427e2f0251"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g361d0ba27ad2ec9e99e5eec05f2e76a6">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#ga114"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="#g361d0ba27ad2ec9e99e5eec05f2e76a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb686075ecbdf349387c356826b432191">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#ga115"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="#gb686075ecbdf349387c356826b432191"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g64e5f74483ffb7bd4412f4eefeb22250">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#ga116"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="#g64e5f74483ffb7bd4412f4eefeb22250"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g57abcfb2fa58e743f9d30f579481845a">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#ga117"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga118">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="#g57abcfb2fa58e743f9d30f579481845a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge690d9171bcdb0fedf981804bb923fac">stp_get_media_size</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="#ga118"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga119">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="#ge690d9171bcdb0fedf981804bb923fac"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gebcb03afca6bb0d94e71bdf570d09af9">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#ga119"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="#gebcb03afca6bb0d94e71bdf570d09af9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf2c1a37f8d837fae61bb18de1cd7bdc3">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="#ga120"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="#gf2c1a37f8d837fae61bb18de1cd7bdc3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5735451225c2a355cb11c165e011637d">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#ga121"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="#g5735451225c2a355cb11c165e011637d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge28b0d78641811b1625a52971a2d11fa">stp_verify</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="#ga122"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_default_settings</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="#ge28b0d78641811b1625a52971a2d11fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9f897908b19f5f0cdaf75b483d46e041">stp_default_settings</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="#ga123"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="#g9f897908b19f5f0cdaf75b483d46e041"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#geb61df54d59bfebdcb77b1e5e993ebaa">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g089f9a34f26f700f43858ba3959d8f13">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8eea0724106ea7174b808026ae8d1a5c">stp_get_component_data</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf64e586fca554f2dd65157a76eaad34a">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1b826f02f84aa038c6862575770b629">stp_get_verified</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8a2924dd6393431e994d22c704ec25fc">stp_set_verified</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gbd8b19b70d2f2fc7dcd7c896b3ed5d98">stp_copy_options</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *vs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6a08746f33133e8873236b35eb1e7a62">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The vars data type contains all the information about a print job, this includes information such as the printer model, paper size, print resolution etc. 
 <p>
 Most of these job options are expressed as parameters which vary according to the model and other options selected.<p>
-The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters.<hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="vars.h::compdata_t" ref="ga6" args="" --><p>
+The representation of printer settings has changed dramatically from 4.2. All (well most, anyway) settings outside of basics such as the printer model and sizing settings are now typed parameters. <hr><h2>Typedef Documentation</h2>
+<a class="anchor" name="g9ee295029ad2d072b4099dc390359900"></a><!-- doxytag: member="vars.h::compdata_t" ref="g9ee295029ad2d072b4099dc390359900" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_compdata <a class="el" href="group__vars.html#ga6">compdata_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_compdata <a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">compdata_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -489,13 +498,13 @@ The representation of printer settings has changed dramatically from 4.2. All (w
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="ga2" args="" --><p>
+<a class="anchor" name="g73ac4d52cb5cecbb9694e9038fb7ea82"></a><!-- doxytag: member="vars.h::stp_const_parameter_list_t" ref="g73ac4d52cb5cecbb9694e9038fb7ea82" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef const void* <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef const void* <a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -514,13 +523,13 @@ The constant parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="ga4" args=")(void *)" --><p>
+<a class="anchor" name="gd31fc080a2bd980c6a05a541dc1612a3"></a><!-- doxytag: member="vars.h::stp_copy_data_func_t" ref="gd31fc080a2bd980c6a05a541dc1612a3" args=")(void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a>)(void *)          </td>
+          <td class="md" nowrap valign="top">typedef void*(* <a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a>)(void *)          </td>
         </tr>
       </table>
     </td>
@@ -537,13 +546,13 @@ The constant parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="ga5" args=")(void *)" --><p>
+<a class="anchor" name="g3f7233002f4db790a077e33c2661665c"></a><!-- doxytag: member="vars.h::stp_free_data_func_t" ref="g3f7233002f4db790a077e33c2661665c" args=")(void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a>)(void *)          </td>
+          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a>)(void *)          </td>
         </tr>
       </table>
     </td>
@@ -560,13 +569,13 @@ The constant parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="vars.h::stp_outfunc_t" ref="ga3" args=")(void *data, const char *buffer, size_t bytes)" --><p>
+<a class="anchor" name="gd11be815334025415a8e2023e0cd44c5"></a><!-- doxytag: member="vars.h::stp_outfunc_t" ref="gd11be815334025415a8e2023e0cd44c5" args=")(void *data, const char *buffer, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>)(void *data, const char *buffer, size_t bytes)          </td>
+          <td class="md" nowrap valign="top">typedef void(* <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>)(void *data, const char *buffer, size_t bytes)          </td>
         </tr>
       </table>
     </td>
@@ -586,19 +595,19 @@ There are two output functions supplied by the caller, one to send output data a
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to an opaque object owned by the calling application. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>buffer</em>&nbsp;</td><td>the data to output. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the size of buffer (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the size of buffer (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="ga1" args="" --><p>
+<a class="anchor" name="gb264246d4b7e584447b5f39ed8f7ee05"></a><!-- doxytag: member="vars.h::stp_parameter_list_t" ref="gb264246d4b7e584447b5f39ed8f7ee05" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void* <a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef void* <a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -617,13 +626,13 @@ The parameter_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="ga0" args="" --><p>
+<a class="anchor" name="gde33aeed00b53e4af71ee1f7c4326279"></a><!-- doxytag: member="vars.h::stp_vars_t" ref="gde33aeed00b53e4af71ee1f7c4326279" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_vars <a class="el" href="group__vars.html#ga0">stp_vars_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_vars <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -643,13 +652,13 @@ The vars opaque data type.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="ga135"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="ga135" args="" --><p>
+<a class="anchor" name="gb11c7af74fa0595684377cafe4d4eb53"></a><!-- doxytag: member="vars.h::stp_parameter_activity_t" ref="gb11c7af74fa0595684377cafe4d4eb53" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -665,26 +674,26 @@ The vars opaque data type.
 <p>
 Parameter activity. 
 <p>
-Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off".<dl compact><dt><b>Enumerator: </b></dt><dd>
+Whether a parameter is currently active (i. e. whether its value should be used by the driver or not). All parameters default to being active unless explicitly "turned off". <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga135a30"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="gga135a30" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab"></a><!-- doxytag: member="STP_PARAMETER_INACTIVE" ref="ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab" args="" -->STP_PARAMETER_INACTIVE</em>&nbsp;</td><td>
 Parameter is inactive (unused). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a31"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="gga135a31" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136"></a><!-- doxytag: member="STP_PARAMETER_DEFAULTED" ref="ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136" args="" -->STP_PARAMETER_DEFAULTED</em>&nbsp;</td><td>
 Parameter is set to its default value. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga135a32"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="gga135a32" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99"></a><!-- doxytag: member="STP_PARAMETER_ACTIVE" ref="ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99" args="" -->STP_PARAMETER_ACTIVE</em>&nbsp;</td><td>
 Parameter is active (used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga133"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="ga133" args="" --><p>
+<a class="anchor" name="g13c0565b3039fa25fd77092a578d44e9"></a><!-- doxytag: member="vars.h::stp_parameter_class_t" ref="g13c0565b3039fa25fd77092a578d44e9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_class_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -700,28 +709,28 @@ Parameter is active (used). </td></tr>
 <p>
 Parameter class. 
 <p>
-What kind of setting this is, for the purpose of user interface representation.<dl compact><dt><b>Enumerator: </b></dt><dd>
+What kind of setting this is, for the purpose of user interface representation. <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga133a17"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gga133a17" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11"></a><!-- doxytag: member="STP_PARAMETER_CLASS_FEATURE" ref="gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11" args="" -->STP_PARAMETER_CLASS_FEATURE</em>&nbsp;</td><td>
 Printer feature. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a18"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gga133a18" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a"></a><!-- doxytag: member="STP_PARAMETER_CLASS_OUTPUT" ref="gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a" args="" -->STP_PARAMETER_CLASS_OUTPUT</em>&nbsp;</td><td>
 Output control. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a19"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gga133a19" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9"></a><!-- doxytag: member="STP_PARAMETER_CLASS_CORE" ref="gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9" args="" -->STP_PARAMETER_CLASS_CORE</em>&nbsp;</td><td>
 Core Gimp-Print parameter. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga133a20"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gga133a20" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606"></a><!-- doxytag: member="STP_PARAMETER_CLASS_INVALID" ref="gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606" args="" -->STP_PARAMETER_CLASS_INVALID</em>&nbsp;</td><td>
 Invalid class (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga134"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="ga134" args="" --><p>
+<a class="anchor" name="gaa13470b0a857e96dbe70882b3fb8ebe"></a><!-- doxytag: member="vars.h::stp_parameter_level_t" ref="gaa13470b0a857e96dbe70882b3fb8ebe" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_level_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -737,38 +746,38 @@ Invalid class (should never be used). </td></tr>
 <p>
 Parameter level. 
 <p>
-What "level" a setting is at, for UI design.<dl compact><dt><b>Enumerator: </b></dt><dd>
+What "level" a setting is at, for UI design. <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga134a21"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="gga134a21" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_BASIC" ref="ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca" args="" -->STP_PARAMETER_LEVEL_BASIC</em>&nbsp;</td><td>
 Basic parameter, shown by all UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a22"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="gga134a22" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED" ref="ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc" args="" -->STP_PARAMETER_LEVEL_ADVANCED</em>&nbsp;</td><td>
 Advanced parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a23"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="gga134a23" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED1" ref="ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc" args="" -->STP_PARAMETER_LEVEL_ADVANCED1</em>&nbsp;</td><td>
 Advanced1 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a24"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="gga134a24" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED2" ref="ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8" args="" -->STP_PARAMETER_LEVEL_ADVANCED2</em>&nbsp;</td><td>
 Advanced2 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a25"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="gga134a25" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED3" ref="ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c" args="" -->STP_PARAMETER_LEVEL_ADVANCED3</em>&nbsp;</td><td>
 Advanced3 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a26"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="gga134a26" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_ADVANCED4" ref="ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff" args="" -->STP_PARAMETER_LEVEL_ADVANCED4</em>&nbsp;</td><td>
 Advanced4 parameter, shown by advanced UIs. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a27"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="gga134a27" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INTERNAL" ref="ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd" args="" -->STP_PARAMETER_LEVEL_INTERNAL</em>&nbsp;</td><td>
 Parameters used only within Gimp-Print. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a28"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="gga134a28" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_EXTERNAL" ref="ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203" args="" -->STP_PARAMETER_LEVEL_EXTERNAL</em>&nbsp;</td><td>
 Parameters used only outside Gimp-Print. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga134a29"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="gga134a29" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3"></a><!-- doxytag: member="STP_PARAMETER_LEVEL_INVALID" ref="ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3" args="" -->STP_PARAMETER_LEVEL_INVALID</em>&nbsp;</td><td>
 Invalid level (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga132"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ga132" args="" --><p>
+<a class="anchor" name="ge031ab2c7ff60007e284ed71a73111e5"></a><!-- doxytag: member="vars.h::stp_parameter_type_t" ref="ge031ab2c7ff60007e284ed71a73111e5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_type_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -784,40 +793,40 @@ Invalid level (should never be used). </td></tr>
 <p>
 Parameter types. 
 <p>
-The following types are permitted for a printer setting. Not all are currently implemented.<dl compact><dt><b>Enumerator: </b></dt><dd>
+The following types are permitted for a printer setting. Not all are currently implemented. <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga132a7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gga132a7" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2"></a><!-- doxytag: member="STP_PARAMETER_TYPE_STRING_LIST" ref="gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2" args="" -->STP_PARAMETER_TYPE_STRING_LIST</em>&nbsp;</td><td>
 Single string choice from a list. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a8"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gga132a8" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INT" ref="gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4" args="" -->STP_PARAMETER_TYPE_INT</em>&nbsp;</td><td>
 Integer. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a9"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gga132a9" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d"></a><!-- doxytag: member="STP_PARAMETER_TYPE_BOOLEAN" ref="gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d" args="" -->STP_PARAMETER_TYPE_BOOLEAN</em>&nbsp;</td><td>
 Boolean. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a10"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gga132a10" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DOUBLE" ref="gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81" args="" -->STP_PARAMETER_TYPE_DOUBLE</em>&nbsp;</td><td>
 Floating point number. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a11"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gga132a11" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e"></a><!-- doxytag: member="STP_PARAMETER_TYPE_CURVE" ref="gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e" args="" -->STP_PARAMETER_TYPE_CURVE</em>&nbsp;</td><td>
 Curve. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a12"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gga132a12" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6"></a><!-- doxytag: member="STP_PARAMETER_TYPE_FILE" ref="gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6" args="" -->STP_PARAMETER_TYPE_FILE</em>&nbsp;</td><td>
 Filename (NYI, need to consider security). </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a13"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gga132a13" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372"></a><!-- doxytag: member="STP_PARAMETER_TYPE_RAW" ref="gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372" args="" -->STP_PARAMETER_TYPE_RAW</em>&nbsp;</td><td>
 Raw, opaque data. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a14"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gga132a14" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d"></a><!-- doxytag: member="STP_PARAMETER_TYPE_ARRAY" ref="gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d" args="" -->STP_PARAMETER_TYPE_ARRAY</em>&nbsp;</td><td>
 Array. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a15"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gga132a15" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7"></a><!-- doxytag: member="STP_PARAMETER_TYPE_DIMENSION" ref="gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7" args="" -->STP_PARAMETER_TYPE_DIMENSION</em>&nbsp;</td><td>
 Linear dimension. </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga132a16"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gga132a16" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576"></a><!-- doxytag: member="STP_PARAMETER_TYPE_INVALID" ref="gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576" args="" -->STP_PARAMETER_TYPE_INVALID</em>&nbsp;</td><td>
 Invalid type (should never be used). </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga136"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="ga136" args="" --><p>
+<a class="anchor" name="g1d02c21b8f025b121dd340db9adf3516"></a><!-- doxytag: member="vars.h::stp_parameter_verify_t" ref="g1d02c21b8f025b121dd340db9adf3516" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -833,11 +842,11 @@ Invalid type (should never be used). </td></tr>
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="gga136a33"></a><!-- doxytag: member="PARAMETER_BAD" ref="gga136a33" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25"></a><!-- doxytag: member="PARAMETER_BAD" ref="gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25" args="" -->PARAMETER_BAD</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga136a34"></a><!-- doxytag: member="PARAMETER_OK" ref="gga136a34" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333"></a><!-- doxytag: member="PARAMETER_OK" ref="gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333" args="" -->PARAMETER_OK</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="gga136a35"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gga136a35" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9"></a><!-- doxytag: member="PARAMETER_INACTIVE" ref="gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9" args="" -->PARAMETER_INACTIVE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -845,7 +854,7 @@ Invalid type (should never be used). </td></tr>
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga124"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="ga124" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" --><p>
+<a class="anchor" name="geb61df54d59bfebdcb77b1e5e993ebaa"></a><!-- doxytag: member="vars.h::stp_allocate_component_data" ref="geb61df54d59bfebdcb77b1e5e993ebaa" args="(stp_vars_t *v, const char *name, stp_copy_data_func_t copyfunc, stp_free_data_func_t freefunc, void *data)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -853,7 +862,7 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td class="md" nowrap valign="top">void stp_allocate_component_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -865,13 +874,13 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>copyfunc</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>freefunc</em>, </td>
         </tr>
         <tr>
@@ -900,7 +909,7 @@ Invalid type (should never be used). </td></tr>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga107"></a><!-- doxytag: member="vars.h::stp_check_array_parameter" ref="ga107" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="gdf6c305c48d012bc138db025c9bd63df"></a><!-- doxytag: member="vars.h::stp_check_array_parameter" ref="gdf6c305c48d012bc138db025c9bd63df" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -908,7 +917,7 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td class="md" nowrap valign="top">int stp_check_array_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -920,7 +929,7 @@ Invalid type (should never be used). </td></tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -946,13 +955,13 @@ Check if an array parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga105"></a><!-- doxytag: member="vars.h::stp_check_boolean_parameter" ref="ga105" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="gadfd66825dd58fb8e0851d493445c4e4"></a><!-- doxytag: member="vars.h::stp_check_boolean_parameter" ref="gadfd66825dd58fb8e0851d493445c4e4" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -960,7 +969,7 @@ Check if an array parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_boolean_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -972,7 +981,7 @@ Check if an array parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -998,13 +1007,13 @@ Check if a boolean parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga106"></a><!-- doxytag: member="vars.h::stp_check_curve_parameter" ref="ga106" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="geecfc1f1fdc97ea165ae35b64de95178"></a><!-- doxytag: member="vars.h::stp_check_curve_parameter" ref="geecfc1f1fdc97ea165ae35b64de95178" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1012,7 +1021,7 @@ Check if a boolean parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_curve_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1024,7 +1033,7 @@ Check if a boolean parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1050,13 +1059,13 @@ Check if a curve parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga104"></a><!-- doxytag: member="vars.h::stp_check_dimension_parameter" ref="ga104" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="gcdfa2f747081721c03b10484a832a535"></a><!-- doxytag: member="vars.h::stp_check_dimension_parameter" ref="gcdfa2f747081721c03b10484a832a535" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1064,7 +1073,7 @@ Check if a curve parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_dimension_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1076,7 +1085,7 @@ Check if a curve parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1102,13 +1111,13 @@ Check if a dimension parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga101"></a><!-- doxytag: member="vars.h::stp_check_file_parameter" ref="ga101" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="gb411dae8fb16ec9f289d4f2f1ecabcfc"></a><!-- doxytag: member="vars.h::stp_check_file_parameter" ref="gb411dae8fb16ec9f289d4f2f1ecabcfc" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1116,7 +1125,7 @@ Check if a dimension parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_file_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1128,7 +1137,7 @@ Check if a dimension parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1154,13 +1163,13 @@ Check if a file parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga102"></a><!-- doxytag: member="vars.h::stp_check_float_parameter" ref="ga102" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g2deea3612965e28cd0d513c5850ca074"></a><!-- doxytag: member="vars.h::stp_check_float_parameter" ref="g2deea3612965e28cd0d513c5850ca074" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1168,7 +1177,7 @@ Check if a file parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_float_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1180,7 +1189,7 @@ Check if a file parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1206,13 +1215,13 @@ Check if a float parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga103"></a><!-- doxytag: member="vars.h::stp_check_int_parameter" ref="ga103" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g056b021334fe812aa14bbbfd60aafba8"></a><!-- doxytag: member="vars.h::stp_check_int_parameter" ref="g056b021334fe812aa14bbbfd60aafba8" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1220,7 +1229,7 @@ Check if a float parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_int_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1232,7 +1241,7 @@ Check if a float parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1258,13 +1267,13 @@ Check if an integer parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga108"></a><!-- doxytag: member="vars.h::stp_check_raw_parameter" ref="ga108" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g5bd30b408d6ec16b3999dce5e540a5fa"></a><!-- doxytag: member="vars.h::stp_check_raw_parameter" ref="g5bd30b408d6ec16b3999dce5e540a5fa" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1272,7 +1281,7 @@ Check if an integer parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_raw_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1284,7 +1293,7 @@ Check if an integer parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1310,13 +1319,13 @@ Check if a raw parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga100"></a><!-- doxytag: member="vars.h::stp_check_string_parameter" ref="ga100" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="gae6b21f76f675516e9189c47444e17cf"></a><!-- doxytag: member="vars.h::stp_check_string_parameter" ref="gae6b21f76f675516e9189c47444e17cf" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1324,7 +1333,7 @@ Check if a raw parameter is set.
         <tr>
           <td class="md" nowrap valign="top">int stp_check_string_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1336,7 +1345,7 @@ Check if a raw parameter is set.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -1362,13 +1371,13 @@ Check if a string parameter is set.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the minimum activity status. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga89"></a><!-- doxytag: member="vars.h::stp_clear_array_parameter" ref="ga89" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gb9df68cbf9973203adfca5e1293b300a"></a><!-- doxytag: member="vars.h::stp_clear_array_parameter" ref="gb9df68cbf9973203adfca5e1293b300a" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1376,7 +1385,7 @@ Check if a string parameter is set.
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_array_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1407,13 +1416,13 @@ Clear an array parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga87"></a><!-- doxytag: member="vars.h::stp_clear_boolean_parameter" ref="ga87" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="ge5b7e3356b3c1c893620fdeeea486e48"></a><!-- doxytag: member="vars.h::stp_clear_boolean_parameter" ref="ge5b7e3356b3c1c893620fdeeea486e48" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1421,7 +1430,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_boolean_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1452,13 +1461,13 @@ Clear (remove) a boolean parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga88"></a><!-- doxytag: member="vars.h::stp_clear_curve_parameter" ref="ga88" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g9e992f880bd74cd4097527a39aea7125"></a><!-- doxytag: member="vars.h::stp_clear_curve_parameter" ref="g9e992f880bd74cd4097527a39aea7125" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1466,7 +1475,7 @@ Clear (remove) a boolean parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_curve_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1497,13 +1506,13 @@ Clear a curve parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga86"></a><!-- doxytag: member="vars.h::stp_clear_dimension_parameter" ref="ga86" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g28203d9250f232f9af290802cf2db881"></a><!-- doxytag: member="vars.h::stp_clear_dimension_parameter" ref="g28203d9250f232f9af290802cf2db881" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1511,7 +1520,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_dimension_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1542,13 +1551,13 @@ Clear (remove) a dimension parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga83"></a><!-- doxytag: member="vars.h::stp_clear_file_parameter" ref="ga83" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g7acde85eb361525f5cf481bafddbc1bd"></a><!-- doxytag: member="vars.h::stp_clear_file_parameter" ref="g7acde85eb361525f5cf481bafddbc1bd" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1556,7 +1565,7 @@ Clear (remove) a dimension parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_file_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1587,13 +1596,13 @@ Clear a file parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga84"></a><!-- doxytag: member="vars.h::stp_clear_float_parameter" ref="ga84" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g740a5cab681f30b8cc5e4ca18197e472"></a><!-- doxytag: member="vars.h::stp_clear_float_parameter" ref="g740a5cab681f30b8cc5e4ca18197e472" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1601,7 +1610,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_float_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1632,13 +1641,13 @@ Clear (remove) a float parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga85"></a><!-- doxytag: member="vars.h::stp_clear_int_parameter" ref="ga85" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g4841e9250e4c7f38f2267355402ffcc1"></a><!-- doxytag: member="vars.h::stp_clear_int_parameter" ref="g4841e9250e4c7f38f2267355402ffcc1" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1646,7 +1655,7 @@ Clear (remove) a float parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_int_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1677,13 +1686,13 @@ Clear (remove) an integer parameter.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga90"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="ga90" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="ga79b051578077beca548be224062705c"></a><!-- doxytag: member="vars.h::stp_clear_raw_parameter" ref="ga79b051578077beca548be224062705c" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1691,7 +1700,7 @@ Clear (remove) an integer parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_raw_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1722,13 +1731,13 @@ Clear a raw parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga82"></a><!-- doxytag: member="vars.h::stp_clear_string_parameter" ref="ga82" args="(stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gc7fe8cd335309d755fe5b54bf6b8e5a3"></a><!-- doxytag: member="vars.h::stp_clear_string_parameter" ref="gc7fe8cd335309d755fe5b54bf6b8e5a3" args="(stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1736,7 +1745,7 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td class="md" nowrap valign="top">void stp_clear_string_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1767,13 +1776,13 @@ Clear a string parameter.
 The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga130"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="ga130" args="(stp_vars_t *vd, const stp_vars_t *vs)" --><p>
+<a class="anchor" name="gbd8b19b70d2f2fc7dcd7c896b3ed5d98"></a><!-- doxytag: member="vars.h::stp_copy_options" ref="gbd8b19b70d2f2fc7dcd7c896b3ed5d98" args="(stp_vars_t *vd, const stp_vars_t *vs)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1781,13 +1790,13 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
         <tr>
           <td class="md" nowrap valign="top">void stp_copy_options           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>vd</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>vs</em></td>
         </tr>
         <tr>
@@ -1810,13 +1819,13 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga123"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="ga123" args="(void)" --><p>
+<a class="anchor" name="g9f897908b19f5f0cdaf75b483d46e041"></a><!-- doxytag: member="vars.h::stp_default_settings" ref="g9f897908b19f5f0cdaf75b483d46e041" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_default_settings           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_default_settings           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -1837,11 +1846,11 @@ The parameter is set to NULL. <dl compact><dt><b>Parameters:</b></dt><dd>
 <p>
 Get default global settings. 
 <p>
-The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer. <dl compact><dt><b>Returns:</b></dt><dd>the default settings.</dd></dl>
+The main use of this is to provide a usable stp_vars_t for purposes of parameter inquiry in the absence of a specific printer. This is currently used in a variety of places to get information on the standard color parameters without querying a particular printer. <dl compact><dt><b>Returns:</b></dt><dd>the default settings. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga47"></a><!-- doxytag: member="vars.h::stp_describe_parameter" ref="ga47" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
+<a class="anchor" name="ged453c314365a3948b195e3175455a12"></a><!-- doxytag: member="vars.h::stp_describe_parameter" ref="ged453c314365a3948b195e3175455a12" args="(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1849,7 +1858,7 @@ The main use of this is to provide a usable stp_vars_t for purposes of parameter
         <tr>
           <td class="md" nowrap valign="top">void stp_describe_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1887,13 +1896,13 @@ All of the parameter fields will be populated. <dl compact><dt><b>Parameters:</b
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>a pointer to an <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> to store the parameter description in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>a pointer to an <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> to store the parameter description in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga121"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="ga121" args="(const stp_vars_t *v, int *x, int *y)" --><p>
+<a class="anchor" name="g5735451225c2a355cb11c165e011637d"></a><!-- doxytag: member="vars.h::stp_describe_resolution" ref="g5735451225c2a355cb11c165e011637d" args="(const stp_vars_t *v, int *x, int *y)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1901,7 +1910,7 @@ All of the parameter fields will be populated. <dl compact><dt><b>Parameters:</b
         <tr>
           <td class="md" nowrap valign="top">void stp_describe_resolution           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1939,13 +1948,13 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>x</em>&nbsp;</td><td>a pointer to a int to store the horizontal resolution in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>y</em>&nbsp;</td><td>a pointer to a int to store the vertical resolution in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>y</em>&nbsp;</td><td>a pointer to a int to store the vertical resolution in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga125"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="ga125" args="(stp_vars_t *v, const char *name)" --><p>
+<a class="anchor" name="g089f9a34f26f700f43858ba3959d8f13"></a><!-- doxytag: member="vars.h::stp_destroy_component_data" ref="g089f9a34f26f700f43858ba3959d8f13" args="(stp_vars_t *v, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1953,7 +1962,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
         <tr>
           <td class="md" nowrap valign="top">void stp_destroy_component_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -1982,7 +1991,7 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga131"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="ga131" args="(stp_parameter_t *desc, const stp_parameter_t *param)" --><p>
+<a class="anchor" name="g6a08746f33133e8873236b35eb1e7a62"></a><!-- doxytag: member="vars.h::stp_fill_parameter_settings" ref="g6a08746f33133e8873236b35eb1e7a62" args="(stp_parameter_t *desc, const stp_parameter_t *param)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2019,15 +2028,15 @@ If the resolution is invalid, -1 will be returned in both x and y. <dl compact><
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga80"></a><!-- doxytag: member="vars.h::stp_get_array_parameter" ref="ga80" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gb918206f9b70fff5d58a16a762295981"></a><!-- doxytag: member="vars.h::stp_get_array_parameter" ref="gb918206f9b70fff5d58a16a762295981" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_get_array_parameter           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_get_array_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2061,19 +2070,19 @@ Get an array parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the array, or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the array, or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga116"></a><!-- doxytag: member="vars.h::stp_get_array_parameter_active" ref="ga116" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g64e5f74483ffb7bd4412f4eefeb22250"></a><!-- doxytag: member="vars.h::stp_get_array_parameter_active" ref="g64e5f74483ffb7bd4412f4eefeb22250" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_array_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2107,11 +2116,11 @@ Get the activity status of an array parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga78"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter" ref="ga78" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g4cc8b69619067f882035cca46e9ce0cd"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter" ref="g4cc8b69619067f882035cca46e9ce0cd" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2119,7 +2128,7 @@ Get the activity status of an array parameter.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_boolean_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2153,19 +2162,19 @@ Get a boolean parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the boolean value.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the boolean value. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga114"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter_active" ref="ga114" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g361d0ba27ad2ec9e99e5eec05f2e76a6"></a><!-- doxytag: member="vars.h::stp_get_boolean_parameter_active" ref="g361d0ba27ad2ec9e99e5eec05f2e76a6" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_boolean_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2199,11 +2208,11 @@ Get the activity status of a boolean parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga16"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="ga16" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g087136342c500c138d73dbe0e2aad11a"></a><!-- doxytag: member="vars.h::stp_get_color_conversion" ref="g087136342c500c138d73dbe0e2aad11a" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2211,7 +2220,7 @@ Get the activity status of a boolean parameter.
         <tr>
           <td class="md" nowrap valign="top">const char* stp_get_color_conversion           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2230,11 +2239,11 @@ Get the activity status of a boolean parameter.
 <p>
 Get the name of the color conversion routine. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the name of the color conversion routine (must not be freed).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the name of the color conversion routine (must not be freed). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga126"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="ga126" args="(const stp_vars_t *v, const char *name)" --><p>
+<a class="anchor" name="g8eea0724106ea7174b808026ae8d1a5c"></a><!-- doxytag: member="vars.h::stp_get_component_data" ref="g8eea0724106ea7174b808026ae8d1a5c" args="(const stp_vars_t *v, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2242,7 +2251,7 @@ Get the name of the color conversion routine.
         <tr>
           <td class="md" nowrap valign="top">void* stp_get_component_data           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2271,15 +2280,15 @@ Get the name of the color conversion routine.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga79"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter" ref="ga79" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g1a5a2746548465d681d00c6301a26100"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter" ref="g1a5a2746548465d681d00c6301a26100" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_get_curve_parameter           </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_get_curve_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2313,19 +2322,19 @@ Get a curve parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the curve, or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the curve, or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga115"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter_active" ref="ga115" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gb686075ecbdf349387c356826b432191"></a><!-- doxytag: member="vars.h::stp_get_curve_parameter_active" ref="gb686075ecbdf349387c356826b432191" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_curve_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2359,11 +2368,11 @@ Get the activity status of a curve parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga77"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter" ref="ga77" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gb4121cba599314c929d04cce0e850473"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter" ref="gb4121cba599314c929d04cce0e850473" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2371,7 +2380,7 @@ Get the activity status of a curve parameter.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_dimension_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2405,19 +2414,19 @@ Get a dimension parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the dimension (integer) value.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the dimension (integer) value. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga113"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter_active" ref="ga113" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g8125d08f90002e654f2e45427e2f0251"></a><!-- doxytag: member="vars.h::stp_get_dimension_parameter_active" ref="g8125d08f90002e654f2e45427e2f0251" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_dimension_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2451,11 +2460,11 @@ Get the activity status of a dimension parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="ga13" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="gcf8efdb6fd9847e41c85f9491a252f01"></a><!-- doxytag: member="vars.h::stp_get_driver" ref="gcf8efdb6fd9847e41c85f9491a252f01" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2463,7 +2472,7 @@ Get the activity status of a dimension parameter.
         <tr>
           <td class="md" nowrap valign="top">const char* stp_get_driver           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2482,11 +2491,11 @@ Get the activity status of a dimension parameter.
 <p>
 Get the name of the printer driver. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the name of the printer driver (must not be freed).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the name of the printer driver (must not be freed). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga36"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="ga36" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ge66b9c64f5821ee6e95f4b9e18cadd4e"></a><!-- doxytag: member="vars.h::stp_get_errdata" ref="ge66b9c64f5821ee6e95f4b9e18cadd4e" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2494,7 +2503,7 @@ Get the name of the printer driver.
         <tr>
           <td class="md" nowrap valign="top">void* stp_get_errdata           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2518,19 +2527,19 @@ Get the error data.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the output data.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the output data. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga32"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="ga32" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g9fe5b4efdfaa3e79918dd5079e61e2c5"></a><!-- doxytag: member="vars.h::stp_get_errfunc" ref="g9fe5b4efdfaa3e79918dd5079e61e2c5" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> stp_get_errfunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> stp_get_errfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2554,11 +2563,11 @@ Get the function used to print output information.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the outfunc.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the outfunc. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga74"></a><!-- doxytag: member="vars.h::stp_get_file_parameter" ref="ga74" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g5efb45e6883a2522fd7e78c6eb761c79"></a><!-- doxytag: member="vars.h::stp_get_file_parameter" ref="g5efb45e6883a2522fd7e78c6eb761c79" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2566,7 +2575,7 @@ Get the function used to print output information.
         <tr>
           <td class="md" nowrap valign="top">const char* stp_get_file_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2600,19 +2609,19 @@ Get a file parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the filename, or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the filename, or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga110"></a><!-- doxytag: member="vars.h::stp_get_file_parameter_active" ref="ga110" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g0f09e85b570ffee4a4d94853bb22bcb3"></a><!-- doxytag: member="vars.h::stp_get_file_parameter_active" ref="g0f09e85b570ffee4a4d94853bb22bcb3" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_file_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2646,11 +2655,11 @@ Get the activity status of a file parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga75"></a><!-- doxytag: member="vars.h::stp_get_float_parameter" ref="ga75" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g46195f69cc57bd18a4cde5756dd84601"></a><!-- doxytag: member="vars.h::stp_get_float_parameter" ref="g46195f69cc57bd18a4cde5756dd84601" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2658,7 +2667,7 @@ Get the activity status of a file parameter.
         <tr>
           <td class="md" nowrap valign="top">double stp_get_float_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2692,19 +2701,19 @@ Get a float parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the float value.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the float value. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga111"></a><!-- doxytag: member="vars.h::stp_get_float_parameter_active" ref="ga111" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g28d01beda4b54cec395654847dbbc301"></a><!-- doxytag: member="vars.h::stp_get_float_parameter_active" ref="g28d01beda4b54cec395654847dbbc301" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_float_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2738,11 +2747,11 @@ Get the activity status of a float parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga24"></a><!-- doxytag: member="vars.h::stp_get_height" ref="ga24" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g7623276e130cb684670ecb153300ebaf"></a><!-- doxytag: member="vars.h::stp_get_height" ref="g7623276e130cb684670ecb153300ebaf" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2750,7 +2759,7 @@ Get the activity status of a float parameter.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_height           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2769,11 +2778,11 @@ Get the activity status of a float parameter.
 <p>
 Get the height of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga119"></a><!-- doxytag: member="vars.h::stp_get_imageable_area" ref="ga119" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
+<a class="anchor" name="gebcb03afca6bb0d94e71bdf570d09af9"></a><!-- doxytag: member="vars.h::stp_get_imageable_area" ref="gebcb03afca6bb0d94e71bdf570d09af9" args="(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2781,7 +2790,7 @@ Get the height of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_get_imageable_area           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2836,13 +2845,13 @@ If the media size stored in V is invalid, the return values will be indeterminat
     <tr><td valign="top"></td><td valign="top"><em>left</em>&nbsp;</td><td>a pointer to a int to store the left edge in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>right</em>&nbsp;</td><td>a pointer to a int to store the right edge in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>bottom</em>&nbsp;</td><td>a pointer to a int to store the bottom edge in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>top</em>&nbsp;</td><td>a pointer to a int to store the top edge in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga76"></a><!-- doxytag: member="vars.h::stp_get_int_parameter" ref="ga76" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g22bc2b8307fb6a95dac7fcf3d35bf6b9"></a><!-- doxytag: member="vars.h::stp_get_int_parameter" ref="g22bc2b8307fb6a95dac7fcf3d35bf6b9" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2850,7 +2859,7 @@ If the media size stored in V is invalid, the return values will be indeterminat
         <tr>
           <td class="md" nowrap valign="top">int stp_get_int_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2884,19 +2893,19 @@ Get an integer parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the integer value.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the integer value. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga112"></a><!-- doxytag: member="vars.h::stp_get_int_parameter_active" ref="ga112" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gac76d8e06c3ce3fb0f27c0c80d6ad5fc"></a><!-- doxytag: member="vars.h::stp_get_int_parameter_active" ref="gac76d8e06c3ce3fb0f27c0c80d6ad5fc" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_int_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -2930,11 +2939,11 @@ Get the activity status of an integer parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga18"></a><!-- doxytag: member="vars.h::stp_get_left" ref="ga18" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="gd3fbd778898c2b0fba19d0937fb939f5"></a><!-- doxytag: member="vars.h::stp_get_left" ref="gd3fbd778898c2b0fba19d0937fb939f5" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2942,7 +2951,7 @@ Get the activity status of an integer parameter.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_left           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -2961,11 +2970,11 @@ Get the activity status of an integer parameter.
 <p>
 Get the left edge of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga118"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="ga118" args="(const stp_vars_t *v, int *width, int *height)" --><p>
+<a class="anchor" name="ge690d9171bcdb0fedf981804bb923fac"></a><!-- doxytag: member="vars.h::stp_get_media_size" ref="ge690d9171bcdb0fedf981804bb923fac" args="(const stp_vars_t *v, int *width, int *height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -2973,7 +2982,7 @@ Get the left edge of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_get_media_size           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3011,13 +3020,13 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>width</em>&nbsp;</td><td>a pointer to an int to store the media width in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>a pointer to an int to store the media height in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>height</em>&nbsp;</td><td>a pointer to an int to store the media height in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga34"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="ga34" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g54e35f94578f346c07718587f18b049c"></a><!-- doxytag: member="vars.h::stp_get_outdata" ref="g54e35f94578f346c07718587f18b049c" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3025,7 +3034,7 @@ Retrieve the media size of the media type set in V, expressed in units of 1/72".
         <tr>
           <td class="md" nowrap valign="top">void* stp_get_outdata           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3049,19 +3058,19 @@ Get the output data.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the output data.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the output data. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga30"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="ga30" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g095834813ebbe8985d443e1fa78a0b98"></a><!-- doxytag: member="vars.h::stp_get_outfunc" ref="g095834813ebbe8985d443e1fa78a0b98" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> stp_get_outfunc           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> stp_get_outfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3085,11 +3094,11 @@ Get the function used to print output information.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the outfunc.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the outfunc. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga28"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="ga28" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g94d8cf912e3b036f67bc2d4c37d733ff"></a><!-- doxytag: member="vars.h::stp_get_page_height" ref="g94d8cf912e3b036f67bc2d4c37d733ff" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3097,7 +3106,7 @@ Get the function used to print output information.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_page_height           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3116,11 +3125,11 @@ Get the function used to print output information.
 <p>
 Get the page height. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the page height.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the page height. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga26"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="ga26" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="gea14f3cad139fc5b8d547a252deacff3"></a><!-- doxytag: member="vars.h::stp_get_page_width" ref="gea14f3cad139fc5b8d547a252deacff3" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3128,7 +3137,7 @@ Get the page height.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_page_width           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3147,19 +3156,19 @@ Get the page height.
 <p>
 Get the page width. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the page width.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the page width. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga38"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="ga38" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g955b215a88b868cfc74d7a340de9b8f6"></a><!-- doxytag: member="vars.h::stp_get_parameter_list" ref="g955b215a88b868cfc74d7a340de9b8f6" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_get_parameter_list           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_get_parameter_list           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3183,11 +3192,11 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a list of available parameters (must be freed with <a class="el" href="group__vars.html#ga42">stp_parameter_list_destroy()</a>).</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a list of available parameters (must be freed with <a class="el" href="group__vars.html#gd0f6c2b153638f551d7709780eb7276a">stp_parameter_list_destroy()</a>). </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga81"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter" ref="ga81" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g9f4db93fc31ad52018bc3ad14b58bfc2"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter" ref="g9f4db93fc31ad52018bc3ad14b58bfc2" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3195,7 +3204,7 @@ This does not fill in the bounds and defaults; it merely provides a list of sett
         <tr>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a>* stp_get_raw_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3229,19 +3238,19 @@ Get a raw parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the raw data, or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the raw data, or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga117"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter_active" ref="ga117" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="g57abcfb2fa58e743f9d30f579481845a"></a><!-- doxytag: member="vars.h::stp_get_raw_parameter_active" ref="g57abcfb2fa58e743f9d30f579481845a" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_raw_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3275,11 +3284,11 @@ Get the activity status of a raw parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga120"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="ga120" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
+<a class="anchor" name="gf2c1a37f8d837fae61bb18de1cd7bdc3"></a><!-- doxytag: member="vars.h::stp_get_size_limit" ref="gf2c1a37f8d837fae61bb18de1cd7bdc3" args="(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3287,7 +3296,7 @@ Get the activity status of a raw parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_get_size_limit           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3339,13 +3348,13 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur
     <tr><td valign="top"></td><td valign="top"><em>max_width</em>&nbsp;</td><td>a pointer to a int to store the maximum width in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>max_height</em>&nbsp;</td><td>a pointer to a int to store the maximum height in. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>min_width</em>&nbsp;</td><td>a pointer to a int to store the minimum width in. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>min_height</em>&nbsp;</td><td>a pointer to a int to store the minimum height in.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>min_height</em>&nbsp;</td><td>a pointer to a int to store the minimum height in. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga73"></a><!-- doxytag: member="vars.h::stp_get_string_parameter" ref="ga73" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="ga59b141facb320c409d9071f469fdbc5"></a><!-- doxytag: member="vars.h::stp_get_string_parameter" ref="ga59b141facb320c409d9071f469fdbc5" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3353,7 +3362,7 @@ Retrieve the minimum and maximum size limits for custom media sizes with the cur
         <tr>
           <td class="md" nowrap valign="top">const char* stp_get_string_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3387,19 +3396,19 @@ Get a string parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the string, or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the string, or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga109"></a><!-- doxytag: member="vars.h::stp_get_string_parameter_active" ref="ga109" args="(const stp_vars_t *v, const char *parameter)" --><p>
+<a class="anchor" name="gda8dd20ab17a9b403c68b4cd86fb529c"></a><!-- doxytag: member="vars.h::stp_get_string_parameter_active" ref="gda8dd20ab17a9b403c68b4cd86fb529c" args="(const stp_vars_t *v, const char *parameter)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> stp_get_string_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3433,11 +3442,11 @@ Get the activity status of a string parameter.
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the activity status.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the activity status. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga20"></a><!-- doxytag: member="vars.h::stp_get_top" ref="ga20" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="gcda38fc8e26a75c2b5d246b4341a8fd3"></a><!-- doxytag: member="vars.h::stp_get_top" ref="gcda38fc8e26a75c2b5d246b4341a8fd3" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3445,7 +3454,7 @@ Get the activity status of a string parameter.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_top           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3464,11 +3473,11 @@ Get the activity status of a string parameter.
 <p>
 Get the top edge of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga128"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga128" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="ga1b826f02f84aa038c6862575770b629"></a><!-- doxytag: member="vars.h::stp_get_verified" ref="ga1b826f02f84aa038c6862575770b629" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3476,7 +3485,7 @@ Get the top edge of the image.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_verified           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3496,7 +3505,7 @@ Get the top edge of the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga22"></a><!-- doxytag: member="vars.h::stp_get_width" ref="ga22" args="(const stp_vars_t *v)" --><p>
+<a class="anchor" name="g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1"></a><!-- doxytag: member="vars.h::stp_get_width" ref="g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1" args="(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3504,7 +3513,7 @@ Get the top edge of the image.
         <tr>
           <td class="md" nowrap valign="top">int stp_get_width           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3523,11 +3532,11 @@ Get the top edge of the image.
 <p>
 Get the width edge of the image. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the left edge.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the left edge. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga37"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="ga37" args="(stp_vars_t *user, const stp_vars_t *print)" --><p>
+<a class="anchor" name="gc970fc314c6418d9193d93c787b908d9"></a><!-- doxytag: member="vars.h::stp_merge_printvars" ref="gc970fc314c6418d9193d93c787b908d9" args="(stp_vars_t *user, const stp_vars_t *print)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3535,13 +3544,13 @@ Get the width edge of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_merge_printvars           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>user</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>print</em></td>
         </tr>
         <tr>
@@ -3563,17 +3572,17 @@ Get the width edge of the image.
 <p>
 Merge defaults for a printer with user-chosen settings. 
 <p>
-<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>This is likely to go away.</dd></dl>
-<dl compact><dt><b>Parameters:</b></dt><dd>
+<dl compact><dt><b><a class="el" href="deprecated.html#_deprecated000002">Deprecated:</a></b></dt><dd>This is likely to go away. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>user</em>&nbsp;</td><td>the destination vars. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>print</em>&nbsp;</td><td>the vars to merge into user.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>print</em>&nbsp;</td><td>the vars to merge into user. </td></tr>
   </table>
 </dl>
+</dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga48"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="ga48" args="(stp_parameter_t *description)" --><p>
+<a class="anchor" name="gc5a3eb0348d31acf60772265c3896542"></a><!-- doxytag: member="vars.h::stp_parameter_description_destroy" ref="gc5a3eb0348d31acf60772265c3896542" args="(stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3602,13 +3611,13 @@ Destroy a parameter description.
 <p>
 This must be called even if the <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> was not allocated with malloc, since some members are dynamically allocated. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>the parameter description to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>description</em>&nbsp;</td><td>the parameter description to destroy. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga40"></a><!-- doxytag: member="vars.h::stp_parameter_find" ref="ga40" args="(stp_const_parameter_list_t list, const char *name)" --><p>
+<a class="anchor" name="g3dea1f995d40482b9f6470fedd994f95"></a><!-- doxytag: member="vars.h::stp_parameter_find" ref="g3dea1f995d40482b9f6470fedd994f95" args="(stp_const_parameter_list_t list, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3616,7 +3625,7 @@ This must be called even if the <a class="el" href="structstp__parameter__t.html
         <tr>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_find           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -3650,11 +3659,11 @@ Find a parameter by its name.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga49"></a><!-- doxytag: member="vars.h::stp_parameter_find_in_settings" ref="ga49" args="(const stp_vars_t *v, const char *name)" --><p>
+<a class="anchor" name="g711cf3e5e52fd3434ef7a9d16654aea8"></a><!-- doxytag: member="vars.h::stp_parameter_find_in_settings" ref="g711cf3e5e52fd3434ef7a9d16654aea8" args="(const stp_vars_t *v, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3662,7 +3671,7 @@ Find a parameter by its name.
         <tr>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_find_in_settings           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -3696,11 +3705,11 @@ Find a parameter by its name from a vars object.
     <tr><td valign="top"></td><td valign="top"><em>name</em>&nbsp;</td><td>the name of the parameter. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga44"></a><!-- doxytag: member="vars.h::stp_parameter_list_add_param" ref="ga44" args="(stp_parameter_list_t list, const stp_parameter_t *item)" --><p>
+<a class="anchor" name="ga8dc4ff543dbc1882d673b25234088b6"></a><!-- doxytag: member="vars.h::stp_parameter_list_add_param" ref="ga8dc4ff543dbc1882d673b25234088b6" args="(stp_parameter_list_t list, const stp_parameter_t *item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3708,7 +3717,7 @@ Find a parameter by its name from a vars object.
         <tr>
           <td class="md" nowrap valign="top">void stp_parameter_list_add_param           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -3739,13 +3748,13 @@ Add a parameter to a parameter_list.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the parameter to add.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the parameter to add. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga46"></a><!-- doxytag: member="vars.h::stp_parameter_list_append" ref="ga46" args="(stp_parameter_list_t list, stp_const_parameter_list_t append)" --><p>
+<a class="anchor" name="gf8aa1d7aba11de5fdee95b9cb339be61"></a><!-- doxytag: member="vars.h::stp_parameter_list_append" ref="gf8aa1d7aba11de5fdee95b9cb339be61" args="(stp_parameter_list_t list, stp_const_parameter_list_t append)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3753,13 +3762,13 @@ Add a parameter to a parameter_list.
         <tr>
           <td class="md" nowrap valign="top">void stp_parameter_list_append           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>append</em></td>
         </tr>
         <tr>
@@ -3784,21 +3793,21 @@ Append one parameter_list to another.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the destination list (to append to). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>append</em>&nbsp;</td><td>the list of paramters to append. Each item that does not already exist in list will be appended.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>append</em>&nbsp;</td><td>the list of paramters to append. Each item that does not already exist in list will be appended. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga45"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="ga45" args="(stp_const_parameter_list_t list)" --><p>
+<a class="anchor" name="g62c6225b0721d5c80d889edc307f0b6b"></a><!-- doxytag: member="vars.h::stp_parameter_list_copy" ref="g62c6225b0721d5c80d889edc307f0b6b" args="(stp_const_parameter_list_t list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_parameter_list_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_parameter_list_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3822,11 +3831,11 @@ A new parameter_list will be created, and then the contents of source will be co
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the source parameter_list. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the parameter_list.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the parameter_list. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga39"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="ga39" args="(stp_const_parameter_list_t list)" --><p>
+<a class="anchor" name="gf69f651a798e9f06c67baf06f0754228"></a><!-- doxytag: member="vars.h::stp_parameter_list_count" ref="gf69f651a798e9f06c67baf06f0754228" args="(stp_const_parameter_list_t list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3834,7 +3843,7 @@ A new parameter_list will be created, and then the contents of source will be co
         <tr>
           <td class="md" nowrap valign="top">size_t stp_parameter_list_count           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3858,17 +3867,17 @@ List the number of available parameters for the currently chosen settings.
     <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the number of parameters.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the number of parameters. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga43"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="ga43" args="(void)" --><p>
+<a class="anchor" name="g3c1ddd3c10c367c0912fdd841576278f"></a><!-- doxytag: member="vars.h::stp_parameter_list_create" ref="g3c1ddd3c10c367c0912fdd841576278f" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> stp_parameter_list_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> stp_parameter_list_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -3889,11 +3898,11 @@ List the number of available parameters for the currently chosen settings.
 <p>
 Create a parameter_list. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created parameter_list.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created parameter_list. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga42"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="ga42" args="(stp_parameter_list_t list)" --><p>
+<a class="anchor" name="gd0f6c2b153638f551d7709780eb7276a"></a><!-- doxytag: member="vars.h::stp_parameter_list_destroy" ref="gd0f6c2b153638f551d7709780eb7276a" args="(stp_parameter_list_t list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3901,7 +3910,7 @@ Create a parameter_list.
         <tr>
           <td class="md" nowrap valign="top">void stp_parameter_list_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -3922,13 +3931,13 @@ Destroy a parameter_list.
 <p>
 It is an error to destroy the parameter_list more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>list</em>&nbsp;</td><td>the parameter_list to destroy. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga41"></a><!-- doxytag: member="vars.h::stp_parameter_list_param" ref="ga41" args="(stp_const_parameter_list_t list, size_t item)" --><p>
+<a class="anchor" name="g96fc73864dfc00ae418f14a81c72be26"></a><!-- doxytag: member="vars.h::stp_parameter_list_param" ref="g96fc73864dfc00ae418f14a81c72be26" args="(stp_const_parameter_list_t list, size_t item)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3936,7 +3945,7 @@ It is an error to destroy the parameter_list more than once. <dl compact><dt><b>
         <tr>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a>* stp_parameter_list_param           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -3970,11 +3979,11 @@ Find a parameter by its index number.
     <tr><td valign="top"></td><td valign="top"><em>item</em>&nbsp;</td><td>the index number of the parameter (must not be greater than stp_parameter_list_count - 1). </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>a pointer to the parameter (must not be freed), or NULL if no parameter was found. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga61"></a><!-- doxytag: member="vars.h::stp_scale_float_parameter" ref="ga61" args="(stp_vars_t *v, const char *parameter, double scale)" --><p>
+<a class="anchor" name="gec605c647cab13d61ab5e2822d9f7ead"></a><!-- doxytag: member="vars.h::stp_scale_float_parameter" ref="gec605c647cab13d61ab5e2822d9f7ead" args="(stp_vars_t *v, const char *parameter, double scale)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -3982,7 +3991,7 @@ Find a parameter by its index number.
         <tr>
           <td class="md" nowrap valign="top">void stp_scale_float_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4020,13 +4029,13 @@ Multiply the value of a float parameter by a scaling factor.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>scale</em>&nbsp;</td><td>the factor to multiply the value by.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>scale</em>&nbsp;</td><td>the factor to multiply the value by. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga59"></a><!-- doxytag: member="vars.h::stp_set_array_parameter" ref="ga59" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" --><p>
+<a class="anchor" name="g1f63514f8ffd8ea56f0beee69398ee01"></a><!-- doxytag: member="vars.h::stp_set_array_parameter" ref="g1f63514f8ffd8ea56f0beee69398ee01" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4034,7 +4043,7 @@ Multiply the value of a float parameter by a scaling factor.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_array_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4046,7 +4055,7 @@ Multiply the value of a float parameter by a scaling factor.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4072,13 +4081,13 @@ Set an array parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga98"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="ga98" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="gf2aada3c00f9b00bc6a65014da87e250"></a><!-- doxytag: member="vars.h::stp_set_array_parameter_active" ref="gf2aada3c00f9b00bc6a65014da87e250" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4086,7 +4095,7 @@ Set an array parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_array_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4098,7 +4107,7 @@ Set an array parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4124,13 +4133,13 @@ Set the activity of an array parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga57"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter" ref="ga57" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<a class="anchor" name="g8f67ed7dcee969e77374fb4daf468d58"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter" ref="g8f67ed7dcee969e77374fb4daf468d58" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4138,7 +4147,7 @@ Set the activity of an array parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_boolean_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4176,13 +4185,13 @@ Set a boolean parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga96"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="ga96" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="ge12a7edf773cbe04fb98b171ba2c2fb9"></a><!-- doxytag: member="vars.h::stp_set_boolean_parameter_active" ref="ge12a7edf773cbe04fb98b171ba2c2fb9" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4190,7 +4199,7 @@ Set a boolean parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_boolean_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4202,7 +4211,7 @@ Set a boolean parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4228,13 +4237,13 @@ Set the activity of a boolean parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga14"></a><!-- doxytag: member="vars.h::stp_set_color_conversion" ref="ga14" args="(stp_vars_t *v, const char *val)" --><p>
+<a class="anchor" name="g335e7eb264fa22343765146fb2318b31"></a><!-- doxytag: member="vars.h::stp_set_color_conversion" ref="g335e7eb264fa22343765146fb2318b31" args="(stp_vars_t *v, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4242,7 +4251,7 @@ Set the activity of a boolean parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_color_conversion           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4273,13 +4282,13 @@ Set the name of the color conversion routine, if not the default.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga15"></a><!-- doxytag: member="vars.h::stp_set_color_conversion_n" ref="ga15" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
+<a class="anchor" name="g3164aa99994dabb561d6c295eb647123"></a><!-- doxytag: member="vars.h::stp_set_color_conversion_n" ref="g3164aa99994dabb561d6c295eb647123" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4287,7 +4296,7 @@ Set the name of the color conversion routine, if not the default.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_color_conversion_n           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4325,13 +4334,13 @@ Set the name of the color conversion routine, if not the default.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga58"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter" ref="ga58" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" --><p>
+<a class="anchor" name="g5f4adaadb80cd2d94569881d96cfa02e"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter" ref="g5f4adaadb80cd2d94569881d96cfa02e" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4339,7 +4348,7 @@ Set the name of the color conversion routine, if not the default.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_curve_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4351,7 +4360,7 @@ Set the name of the color conversion routine, if not the default.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4377,13 +4386,13 @@ Set a curve parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga97"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="ga97" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g160150a3a39d66f5a807d1c750a57890"></a><!-- doxytag: member="vars.h::stp_set_curve_parameter_active" ref="g160150a3a39d66f5a807d1c750a57890" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4391,7 +4400,7 @@ Set a curve parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_curve_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4403,7 +4412,7 @@ Set a curve parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -4429,13 +4438,13 @@ Set the activity of a curveparameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga71"></a><!-- doxytag: member="vars.h::stp_set_default_array_parameter" ref="ga71" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" --><p>
+<a class="anchor" name="ga1620e4be3c7fb85262802338d3143f6"></a><!-- doxytag: member="vars.h::stp_set_default_array_parameter" ref="ga1620e4be3c7fb85262802338d3143f6" args="(stp_vars_t *v, const char *parameter, const stp_array_t *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4443,7 +4452,7 @@ Set the activity of a curveparameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_array_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4455,7 +4464,7 @@ Set the activity of a curveparameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4481,13 +4490,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga69"></a><!-- doxytag: member="vars.h::stp_set_default_boolean_parameter" ref="ga69" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<a class="anchor" name="gd286782f691998858e30a202506bad74"></a><!-- doxytag: member="vars.h::stp_set_default_boolean_parameter" ref="gd286782f691998858e30a202506bad74" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4495,7 +4504,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_boolean_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4533,13 +4542,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga70"></a><!-- doxytag: member="vars.h::stp_set_default_curve_parameter" ref="ga70" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" --><p>
+<a class="anchor" name="gdd7769bfece8597cde869eced1239a1e"></a><!-- doxytag: member="vars.h::stp_set_default_curve_parameter" ref="gdd7769bfece8597cde869eced1239a1e" args="(stp_vars_t *v, const char *parameter, const stp_curve_t *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4547,7 +4556,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_curve_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4559,7 +4568,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>value</em></td>
         </tr>
         <tr>
@@ -4585,13 +4594,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga68"></a><!-- doxytag: member="vars.h::stp_set_default_dimension_parameter" ref="ga68" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<a class="anchor" name="g18b8a4fb414245d2c30df9ee11057845"></a><!-- doxytag: member="vars.h::stp_set_default_dimension_parameter" ref="g18b8a4fb414245d2c30df9ee11057845" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4599,7 +4608,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_dimension_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4637,13 +4646,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga64"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter" ref="ga64" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
+<a class="anchor" name="gae28e4c640fba005a72e92af66327b50"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter" ref="gae28e4c640fba005a72e92af66327b50" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4651,7 +4660,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_file_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4689,13 +4698,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga65"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter_n" ref="ga65" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
+<a class="anchor" name="gdeae102d1bd65147221f56e6095f35ef"></a><!-- doxytag: member="vars.h::stp_set_default_file_parameter_n" ref="gdeae102d1bd65147221f56e6095f35ef" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4703,7 +4712,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_file_parameter_n           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4748,13 +4757,13 @@ The value is set if the parameter is not already set. This avoids having to chec
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga66"></a><!-- doxytag: member="vars.h::stp_set_default_float_parameter" ref="ga66" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
+<a class="anchor" name="g59b79c779211a72de534fb9e61548f97"></a><!-- doxytag: member="vars.h::stp_set_default_float_parameter" ref="g59b79c779211a72de534fb9e61548f97" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4762,7 +4771,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_float_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4800,13 +4809,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga67"></a><!-- doxytag: member="vars.h::stp_set_default_int_parameter" ref="ga67" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<a class="anchor" name="gbf1d9c938d364598414e9f15c41c1f08"></a><!-- doxytag: member="vars.h::stp_set_default_int_parameter" ref="gbf1d9c938d364598414e9f15c41c1f08" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4814,7 +4823,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_int_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4852,13 +4861,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga72"></a><!-- doxytag: member="vars.h::stp_set_default_raw_parameter" ref="ga72" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" --><p>
+<a class="anchor" name="gf95184ecee86a92db2a7d3f050154a46"></a><!-- doxytag: member="vars.h::stp_set_default_raw_parameter" ref="gf95184ecee86a92db2a7d3f050154a46" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4866,7 +4875,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_raw_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4911,13 +4920,13 @@ The value is set if the parameter is not already set. This avoids having to chec
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga62"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter" ref="ga62" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
+<a class="anchor" name="g71306c3e3118d9a4545b0a3cefb863ea"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter" ref="g71306c3e3118d9a4545b0a3cefb863ea" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4925,7 +4934,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_string_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -4963,13 +4972,13 @@ The value is set if the parameter is not already set. This avoids having to chec
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga63"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter_n" ref="ga63" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
+<a class="anchor" name="g65b18994af3384af04e2bf77e288f54f"></a><!-- doxytag: member="vars.h::stp_set_default_string_parameter_n" ref="g65b18994af3384af04e2bf77e288f54f" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -4977,7 +4986,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_default_string_parameter_n           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5022,13 +5031,13 @@ The value is set if the parameter is not already set. This avoids having to chec
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga56"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter" ref="ga56" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<a class="anchor" name="g778b0e43aad1e011012b8071b469c694"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter" ref="g778b0e43aad1e011012b8071b469c694" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5036,7 +5045,7 @@ The value is set if the parameter is not already set. This avoids having to chec
         <tr>
           <td class="md" nowrap valign="top">void stp_set_dimension_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5074,13 +5083,13 @@ Set a dimension parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga95"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="ga95" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g6fa1953ee96051566a261f3391da3857"></a><!-- doxytag: member="vars.h::stp_set_dimension_parameter_active" ref="g6fa1953ee96051566a261f3391da3857" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5088,7 +5097,7 @@ Set a dimension parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_dimension_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5100,7 +5109,7 @@ Set a dimension parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5126,13 +5135,13 @@ Set the activity of a dimension parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="ga11" args="(stp_vars_t *v, const char *val)" --><p>
+<a class="anchor" name="ga8d9dbb1e613cfe2b119668158e35a76"></a><!-- doxytag: member="vars.h::stp_set_driver" ref="ga8d9dbb1e613cfe2b119668158e35a76" args="(stp_vars_t *v, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5140,7 +5149,7 @@ Set the activity of a dimension parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_driver           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5171,13 +5180,13 @@ Set the name of the printer driver.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="vars.h::stp_set_driver_n" ref="ga12" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
+<a class="anchor" name="ge303a6ed77135b691ebbfd56cb577531"></a><!-- doxytag: member="vars.h::stp_set_driver_n" ref="ge303a6ed77135b691ebbfd56cb577531" args="(stp_vars_t *v, const char *val, int bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5185,7 +5194,7 @@ Set the name of the printer driver.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_driver_n           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5223,13 +5232,13 @@ Set the name of the printer driver.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the name to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of val (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga35"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="ga35" args="(stp_vars_t *v, void *val)" --><p>
+<a class="anchor" name="g7a006418c4dbb265be71f7b5a202455d"></a><!-- doxytag: member="vars.h::stp_set_errdata" ref="g7a006418c4dbb265be71f7b5a202455d" args="(stp_vars_t *v, void *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5237,7 +5246,7 @@ Set the name of the printer driver.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_errdata           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5268,13 +5277,13 @@ Set the error data.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the error data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga31"></a><!-- doxytag: member="vars.h::stp_set_errfunc" ref="ga31" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
+<a class="anchor" name="ge89d8eb48e4a7a8107b87a44a4318064"></a><!-- doxytag: member="vars.h::stp_set_errfunc" ref="ge89d8eb48e4a7a8107b87a44a4318064" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5282,13 +5291,13 @@ Set the error data.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_errfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>val</em></td>
         </tr>
         <tr>
@@ -5313,13 +5322,13 @@ Set the function used to print error and diagnostic information.
 These must be supplied by the caller. errdata is passed as an arguments to errfunc; typically it will be a file descriptor. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga52"></a><!-- doxytag: member="vars.h::stp_set_file_parameter" ref="ga52" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
+<a class="anchor" name="g8134e4dc36b063a7d7dd229b9df32726"></a><!-- doxytag: member="vars.h::stp_set_file_parameter" ref="g8134e4dc36b063a7d7dd229b9df32726" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5327,7 +5336,7 @@ These must be supplied by the caller. errdata is passed as an arguments to errfu
         <tr>
           <td class="md" nowrap valign="top">void stp_set_file_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5365,13 +5374,13 @@ Set a file parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga92"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="ga92" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g8c04ab4487623a41e0b2600d466a88ad"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_active" ref="g8c04ab4487623a41e0b2600d466a88ad" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5379,7 +5388,7 @@ Set a file parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_file_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5391,7 +5400,7 @@ Set a file parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5417,13 +5426,13 @@ Set the activity of a file parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga53"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_n" ref="ga53" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
+<a class="anchor" name="g6e6c5474c253a452073eba25251a1481"></a><!-- doxytag: member="vars.h::stp_set_file_parameter_n" ref="g6e6c5474c253a452073eba25251a1481" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5431,7 +5440,7 @@ Set the activity of a file parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_file_parameter_n           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5476,13 +5485,13 @@ Set a file parameter.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga54"></a><!-- doxytag: member="vars.h::stp_set_float_parameter" ref="ga54" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
+<a class="anchor" name="g82f7bbcf639c60678c1dc2aee24e8a24"></a><!-- doxytag: member="vars.h::stp_set_float_parameter" ref="g82f7bbcf639c60678c1dc2aee24e8a24" args="(stp_vars_t *v, const char *parameter, double value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5490,7 +5499,7 @@ Set a file parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_float_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5528,13 +5537,13 @@ Set a float parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga93"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="ga93" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g38a95079fd6f90a0c6a92c5ddeb104ca"></a><!-- doxytag: member="vars.h::stp_set_float_parameter_active" ref="g38a95079fd6f90a0c6a92c5ddeb104ca" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5542,7 +5551,7 @@ Set a float parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_float_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5554,7 +5563,7 @@ Set a float parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5580,13 +5589,13 @@ Set the activity of a float parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga23"></a><!-- doxytag: member="vars.h::stp_set_height" ref="ga23" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="g68110f6d19b3987f6f66baee3926eb89"></a><!-- doxytag: member="vars.h::stp_set_height" ref="g68110f6d19b3987f6f66baee3926eb89" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5594,7 +5603,7 @@ Set the activity of a float parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_height           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5625,13 +5634,13 @@ Set the height of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga55"></a><!-- doxytag: member="vars.h::stp_set_int_parameter" ref="ga55" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
+<a class="anchor" name="g8c6cd5f3bb3ab59a4f06c020c062c13e"></a><!-- doxytag: member="vars.h::stp_set_int_parameter" ref="g8c6cd5f3bb3ab59a4f06c020c062c13e" args="(stp_vars_t *v, const char *parameter, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5639,7 +5648,7 @@ Set the height of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_int_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5677,13 +5686,13 @@ Set an integer parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga94"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="ga94" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g1c724bc85737bf8c698a08bc2d441b3e"></a><!-- doxytag: member="vars.h::stp_set_int_parameter_active" ref="g1c724bc85737bf8c698a08bc2d441b3e" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5691,7 +5700,7 @@ Set an integer parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_int_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5703,7 +5712,7 @@ Set an integer parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -5729,13 +5738,13 @@ Set the activity of an integer parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga17"></a><!-- doxytag: member="vars.h::stp_set_left" ref="ga17" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="g5d675ab9877df60ec467a20a0d62fcbc"></a><!-- doxytag: member="vars.h::stp_set_left" ref="g5d675ab9877df60ec467a20a0d62fcbc" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5743,7 +5752,7 @@ Set the activity of an integer parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_left           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5774,13 +5783,13 @@ Set the left edge of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga33"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="ga33" args="(stp_vars_t *v, void *val)" --><p>
+<a class="anchor" name="g8fef23ae01a368f4d16ad95813d97d6d"></a><!-- doxytag: member="vars.h::stp_set_outdata" ref="g8fef23ae01a368f4d16ad95813d97d6d" args="(stp_vars_t *v, void *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5788,7 +5797,7 @@ Set the left edge of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_outdata           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5819,13 +5828,13 @@ Set the output data.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the output data. This will typically be a file descriptor, but it is entirely up to the caller exactly what type this might be. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga29"></a><!-- doxytag: member="vars.h::stp_set_outfunc" ref="ga29" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
+<a class="anchor" name="g30d5438686c8ead9a092f98bf3c3d8ca"></a><!-- doxytag: member="vars.h::stp_set_outfunc" ref="g30d5438686c8ead9a092f98bf3c3d8ca" args="(stp_vars_t *v, stp_outfunc_t val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5833,13 +5842,13 @@ Set the output data.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_outfunc           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>val</em></td>
         </tr>
         <tr>
@@ -5864,13 +5873,13 @@ Set the function used to print output information.
 These must be supplied by the caller. outdata is passed as an arguments to outfunc; typically it will be a file descriptor. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga27"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="ga27" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="g775714bf75f1fdbdd895f59edc9eca55"></a><!-- doxytag: member="vars.h::stp_set_page_height" ref="g775714bf75f1fdbdd895f59edc9eca55" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5878,7 +5887,7 @@ These must be supplied by the caller. outdata is passed as an arguments to outfu
         <tr>
           <td class="md" nowrap valign="top">void stp_set_page_height           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5909,13 +5918,13 @@ Set the page height.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga25"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="ga25" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="g751759cdeb8feb061c00f35d37fea45c"></a><!-- doxytag: member="vars.h::stp_set_page_width" ref="g751759cdeb8feb061c00f35d37fea45c" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5923,7 +5932,7 @@ Set the page height.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_page_width           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -5954,13 +5963,13 @@ Set the page width.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga60"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter" ref="ga60" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" --><p>
+<a class="anchor" name="gd40038a74fa7548da5fcaec6687c8787"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter" ref="gd40038a74fa7548da5fcaec6687c8787" args="(stp_vars_t *v, const char *parameter, const void *value, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -5968,7 +5977,7 @@ Set the page width.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_raw_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6013,13 +6022,13 @@ Set a raw parameter.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga99"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="ga99" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g9fe388535a67f8360ab21f58233c0e17"></a><!-- doxytag: member="vars.h::stp_set_raw_parameter_active" ref="g9fe388535a67f8360ab21f58233c0e17" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6027,7 +6036,7 @@ Set a raw parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_raw_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6039,7 +6048,7 @@ Set a raw parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6065,13 +6074,13 @@ Set the activity of a raw parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga50"></a><!-- doxytag: member="vars.h::stp_set_string_parameter" ref="ga50" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
+<a class="anchor" name="g22338d64a871a8b279fdee6fd83fff7f"></a><!-- doxytag: member="vars.h::stp_set_string_parameter" ref="g22338d64a871a8b279fdee6fd83fff7f" args="(stp_vars_t *v, const char *parameter, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6079,7 +6088,7 @@ Set the activity of a raw parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_string_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6117,13 +6126,13 @@ Set a string parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga91"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="ga91" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
+<a class="anchor" name="g44793f2cf64b11917b8943d20ee43b9d"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_active" ref="g44793f2cf64b11917b8943d20ee43b9d" args="(const stp_vars_t *v, const char *parameter, stp_parameter_activity_t active)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6131,7 +6140,7 @@ Set a string parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_string_parameter_active           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6143,7 +6152,7 @@ Set a string parameter.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>active</em></td>
         </tr>
         <tr>
@@ -6169,13 +6178,13 @@ Set the activity of a string parameter.
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>active</em>&nbsp;</td><td>the activity status to set (should be set to STP_PARAMETER_ACTIVE or STP_PARAMETER_INACTIVE). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga51"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_n" ref="ga51" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
+<a class="anchor" name="g5182246d4e0653f73dfaa40b62d4285f"></a><!-- doxytag: member="vars.h::stp_set_string_parameter_n" ref="g5182246d4e0653f73dfaa40b62d4285f" args="(stp_vars_t *v, const char *parameter, const char *value, size_t bytes)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6183,7 +6192,7 @@ Set the activity of a string parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_string_parameter_n           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6228,13 +6237,13 @@ Set a string parameter.
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>parameter</em>&nbsp;</td><td>the name of the parameter. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>value</em>&nbsp;</td><td>the value to set (must not contain NUL). </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes).</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>bytes</em>&nbsp;</td><td>the length of value (in bytes). </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga19"></a><!-- doxytag: member="vars.h::stp_set_top" ref="ga19" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="gaa76e04fcde3aa6c162fb9d2fcaca251"></a><!-- doxytag: member="vars.h::stp_set_top" ref="gaa76e04fcde3aa6c162fb9d2fcaca251" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6242,7 +6251,7 @@ Set a string parameter.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_top           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6273,13 +6282,13 @@ Set the top edge of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga129"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="ga129" args="(stp_vars_t *v, int value)" --><p>
+<a class="anchor" name="g8a2924dd6393431e994d22c704ec25fc"></a><!-- doxytag: member="vars.h::stp_set_verified" ref="g8a2924dd6393431e994d22c704ec25fc" args="(stp_vars_t *v, int value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6287,7 +6296,7 @@ Set the top edge of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_verified           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6316,7 +6325,7 @@ Set the top edge of the image.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga21"></a><!-- doxytag: member="vars.h::stp_set_width" ref="ga21" args="(stp_vars_t *v, int val)" --><p>
+<a class="anchor" name="gdbdd8bad1742e87b5c5a299c2ebf7cf4"></a><!-- doxytag: member="vars.h::stp_set_width" ref="gdbdd8bad1742e87b5c5a299c2ebf7cf4" args="(stp_vars_t *v, int val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6324,7 +6333,7 @@ Set the top edge of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_set_width           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6355,13 +6364,13 @@ Set the width of the image.
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>val</em>&nbsp;</td><td>the value to set. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="vars.h::stp_vars_copy" ref="ga8" args="(stp_vars_t *dest, const stp_vars_t *source)" --><p>
+<a class="anchor" name="g165ae58fed1515b5466ab1b84df85a86"></a><!-- doxytag: member="vars.h::stp_vars_copy" ref="g165ae58fed1515b5466ab1b84df85a86" args="(stp_vars_t *dest, const stp_vars_t *source)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6369,13 +6378,13 @@ Set the width of the image.
         <tr>
           <td class="md" nowrap valign="top">void stp_vars_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>dest</em>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap>const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap>const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>source</em></td>
         </tr>
         <tr>
@@ -6397,22 +6406,22 @@ Set the width of the image.
 <p>
 Copy a vars object. 
 <p>
-Both dest and source must be valid vars objects previously created with <a class="el" href="group__vars.html#ga7">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+Both dest and source must be valid vars objects previously created with <a class="el" href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>dest</em>&nbsp;</td><td>the destination vars. </td></tr>
-    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source vars.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source vars. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="ga7" args="(void)" --><p>
+<a class="anchor" name="gae35d353b6f86b1cbb97bb0b271f5c9a"></a><!-- doxytag: member="vars.h::stp_vars_create" ref="gae35d353b6f86b1cbb97bb0b271f5c9a" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_vars_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_vars_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -6433,19 +6442,19 @@ Both dest and source must be valid vars objects previously created with <a class
 <p>
 Create a new vars object. 
 <p>
-<dl compact><dt><b>Returns:</b></dt><dd>the newly created vars object.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the newly created vars object. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="ga9" args="(const stp_vars_t *source)" --><p>
+<a class="anchor" name="g3c6d765cc5a27b322289e9baa9d97098"></a><!-- doxytag: member="vars.h::stp_vars_create_copy" ref="g3c6d765cc5a27b322289e9baa9d97098" args="(const stp_vars_t *source)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a>* stp_vars_create_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a>* stp_vars_create_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>source</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -6464,16 +6473,16 @@ Create a new vars object.
 <p>
 Copy and allocate a vars object. 
 <p>
-source must be a valid vars object previously created with <a class="el" href="group__vars.html#ga7">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
+source must be a valid vars object previously created with <a class="el" href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a">stp_vars_create()</a>. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
     <tr><td valign="top"></td><td valign="top"><em>source</em>&nbsp;</td><td>the source vars. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the vars.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>the new copy of the vars. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="ga10" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="g78259fcaa881655a07ef0b2b457bdf70"></a><!-- doxytag: member="vars.h::stp_vars_destroy" ref="g78259fcaa881655a07ef0b2b457bdf70" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6481,7 +6490,7 @@ source must be a valid vars object previously created with <a class="el" href="g
         <tr>
           <td class="md" nowrap valign="top">void stp_vars_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -6502,13 +6511,13 @@ Destroy a vars object.
 <p>
 It is an error to destroy the vars more than once. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to destroy.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to destroy. </td></tr>
   </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga122"></a><!-- doxytag: member="vars.h::stp_verify" ref="ga122" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="ge28b0d78641811b1625a52971a2d11fa"></a><!-- doxytag: member="vars.h::stp_verify" ref="ge28b0d78641811b1625a52971a2d11fa" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -6516,7 +6525,7 @@ It is an error to destroy the vars more than once. <dl compact><dt><b>Parameters
         <tr>
           <td class="md" nowrap valign="top">int stp_verify           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -6540,19 +6549,19 @@ Verify that the parameters selected are consistent with those allowed by the dri
     <tr><td valign="top"></td><td valign="top"><em>v</em>&nbsp;</td><td>the vars to use. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success; other status values are reserved.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>0 on failure, 1 on success; other status values are reserved. </dd></dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga127"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="ga127" args="(const stp_vars_t *v, const char *parameter, int quiet)" --><p>
+<a class="anchor" name="gf64e586fca554f2dd65157a76eaad34a"></a><!-- doxytag: member="vars.h::stp_verify_parameter" ref="gf64e586fca554f2dd65157a76eaad34a" args="(const stp_vars_t *v, const char *parameter, int quiet)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a> stp_verify_parameter           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a> stp_verify_parameter           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -6587,8 +6596,8 @@ Verify that the parameters selected are consistent with those allowed by the dri
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/group__version.html b/doc/gutenprint/html/group__version.html
index acd72e2..e63d74e 100644
--- a/doc/gutenprint/html/group__version.html
+++ b/doc/gutenprint/html/group__version.html
@@ -2,56 +2,65 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: version</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>version</h1>Version information.  
 <a href="#_details">More...</a><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga7">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g98b05dcc61492d413bb01421995f1421">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga8">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g26319655da45e42c3b498ae7db0bf62c">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga9">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g02b38fef35caed8b676941e8dd8aadae">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga10">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g08cdc7e05ec4d52b2458470b6d0047fb">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga11">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ge754fd2fde377ba0bbe61aee1a31dd9a">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga12">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gfd63347e8d3a71fa8384db59deabbde5">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga13">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g26c662a55c391d11663052ca39458972">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g888f2f6268a658d1a6b71b5288299488">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="#ga6"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="#g888f2f6268a658d1a6b71b5288299488"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga0">stp_major_version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g19a4efe48689fb8f859d04e60bfe028f">stp_major_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1">stp_minor_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="#g19a4efe48689fb8f859d04e60bfe028f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g66def32167cee385762282e36b60d3b7">stp_minor_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2">stp_micro_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="#g66def32167cee385762282e36b60d3b7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g24960731fb86305c31f0be5621ccb993">stp_micro_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga3">stp_current_interface</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="#g24960731fb86305c31f0be5621ccb993"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc">stp_current_interface</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4">stp_binary_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="#g78c76c5831f5046eee8a56bd010b24dc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0">stp_binary_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5">stp_interface_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="#g97878c63aacb7d1fa8eed6cf1168c2e0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac">stp_interface_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="#gf242f39e07a0ab2f2e25e1b7bc3e3aac"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Version information. 
 <p>
-Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="ga11"></a><!-- doxytag: member="gutenprint-version.h::STP_BINARY_AGE" ref="ga11" args="" --><p>
+Version information may be used to check the library version at compile-time, using macros, or at run-time, using constants. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="ge754fd2fde377ba0bbe61aee1a31dd9a"></a><!-- doxytag: member="gutenprint-version.h::STP_BINARY_AGE" ref="ge754fd2fde377ba0bbe61aee1a31dd9a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -74,7 +83,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga13"></a><!-- doxytag: member="gutenprint-version.h::STP_CHECK_VERSION" ref="ga13" args="(major, minor, micro)" --><p>
+<a class="anchor" name="g26c662a55c391d11663052ca39458972"></a><!-- doxytag: member="gutenprint-version.h::STP_CHECK_VERSION" ref="g26c662a55c391d11663052ca39458972" args="(major, minor, micro)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -105,16 +114,16 @@ Version information may be used to check the library version at compile-time, us
     <td>
 
 <p>
-<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="group__version.html#ga7">STP_MAJOR_VERSION</a> &gt;  (major) ||                \
-  (<a class="code" href="group__version.html#ga7">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga8">STP_MINOR_VERSION</a> &gt; (minor)) ||              \
-  (<a class="code" href="group__version.html#ga7">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga8">STP_MINOR_VERSION</a> == (minor) &amp;&amp;              \
-   <a class="code" href="group__version.html#ga9">STP_MICRO_VERSION</a> &gt;= (micro)))
+<b>Value:</b><div class="fragment"><pre class="fragment">(<a class="code" href="group__version.html#g98b05dcc61492d413bb01421995f1421">STP_MAJOR_VERSION</a> &gt;  (major) ||                \
+  (<a class="code" href="group__version.html#g98b05dcc61492d413bb01421995f1421">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
+   <a class="code" href="group__version.html#g26319655da45e42c3b498ae7db0bf62c">STP_MINOR_VERSION</a> &gt; (minor)) ||              \
+  (<a class="code" href="group__version.html#g98b05dcc61492d413bb01421995f1421">STP_MAJOR_VERSION</a> == (major) &amp;&amp;              \
+   <a class="code" href="group__version.html#g26319655da45e42c3b498ae7db0bf62c">STP_MINOR_VERSION</a> == (minor) &amp;&amp;              \
+   <a class="code" href="group__version.html#g02b38fef35caed8b676941e8dd8aadae">STP_MICRO_VERSION</a> &gt;= (micro)))
 </pre></div>    </td>
   </tr>
 </table>
-<a class="anchor" name="ga10"></a><!-- doxytag: member="gutenprint-version.h::STP_CURRENT_INTERFACE" ref="ga10" args="" --><p>
+<a class="anchor" name="g08cdc7e05ec4d52b2458470b6d0047fb"></a><!-- doxytag: member="gutenprint-version.h::STP_CURRENT_INTERFACE" ref="g08cdc7e05ec4d52b2458470b6d0047fb" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -137,7 +146,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga12"></a><!-- doxytag: member="gutenprint-version.h::STP_INTERFACE_AGE" ref="ga12" args="" --><p>
+<a class="anchor" name="gfd63347e8d3a71fa8384db59deabbde5"></a><!-- doxytag: member="gutenprint-version.h::STP_INTERFACE_AGE" ref="gfd63347e8d3a71fa8384db59deabbde5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -160,7 +169,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga7"></a><!-- doxytag: member="gutenprint-version.h::STP_MAJOR_VERSION" ref="ga7" args="" --><p>
+<a class="anchor" name="g98b05dcc61492d413bb01421995f1421"></a><!-- doxytag: member="gutenprint-version.h::STP_MAJOR_VERSION" ref="g98b05dcc61492d413bb01421995f1421" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -183,7 +192,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga9"></a><!-- doxytag: member="gutenprint-version.h::STP_MICRO_VERSION" ref="ga9" args="" --><p>
+<a class="anchor" name="g02b38fef35caed8b676941e8dd8aadae"></a><!-- doxytag: member="gutenprint-version.h::STP_MICRO_VERSION" ref="g02b38fef35caed8b676941e8dd8aadae" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -206,7 +215,7 @@ Version information may be used to check the library version at compile-time, us
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga8"></a><!-- doxytag: member="gutenprint-version.h::STP_MINOR_VERSION" ref="ga8" args="" --><p>
+<a class="anchor" name="g26319655da45e42c3b498ae7db0bf62c"></a><!-- doxytag: member="gutenprint-version.h::STP_MINOR_VERSION" ref="g26319655da45e42c3b498ae7db0bf62c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -230,7 +239,7 @@ Version information may be used to check the library version at compile-time, us
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="ga6"></a><!-- doxytag: member="gutenprint-version.h::stp_check_version" ref="ga6" args="(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)" --><p>
+<a class="anchor" name="g888f2f6268a658d1a6b71b5288299488"></a><!-- doxytag: member="gutenprint-version.h::stp_check_version" ref="g888f2f6268a658d1a6b71b5288299488" args="(unsigned int required_major, unsigned int required_minor, unsigned int required_micro)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -279,18 +288,18 @@ Check whether the library provides the requested version.
     <tr><td valign="top"></td><td valign="top"><em>required_micro</em>&nbsp;</td><td>the minimum micro revision. </td></tr>
   </table>
 </dl>
-<dl compact><dt><b>Returns:</b></dt><dd>NULL if the version matches, or else a description of the error if the library is too old or too new.</dd></dl>
+<dl compact><dt><b>Returns:</b></dt><dd>NULL if the version matches, or else a description of the error if the library is too old or too new. </dd></dl>
     </td>
   </tr>
 </table>
 <hr><h2>Variable Documentation</h2>
-<a class="anchor" name="ga4"></a><!-- doxytag: member="gutenprint-version.h::stp_binary_age" ref="ga4" args="" --><p>
+<a class="anchor" name="g97878c63aacb7d1fa8eed6cf1168c2e0"></a><!-- doxytag: member="gutenprint-version.h::stp_binary_age" ref="g97878c63aacb7d1fa8eed6cf1168c2e0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga4">stp_binary_age</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0">stp_binary_age</a>          </td>
         </tr>
       </table>
     </td>
@@ -309,13 +318,13 @@ The library ABI binary age number (number of forward-compatible revisions).
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga3"></a><!-- doxytag: member="gutenprint-version.h::stp_current_interface" ref="ga3" args="" --><p>
+<a class="anchor" name="g78c76c5831f5046eee8a56bd010b24dc"></a><!-- doxytag: member="gutenprint-version.h::stp_current_interface" ref="g78c76c5831f5046eee8a56bd010b24dc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga3">stp_current_interface</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc">stp_current_interface</a>          </td>
         </tr>
       </table>
     </td>
@@ -334,13 +343,13 @@ The library ABI revision number (number of incompatible revisions).
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga5"></a><!-- doxytag: member="gutenprint-version.h::stp_interface_age" ref="ga5" args="" --><p>
+<a class="anchor" name="gf242f39e07a0ab2f2e25e1b7bc3e3aac"></a><!-- doxytag: member="gutenprint-version.h::stp_interface_age" ref="gf242f39e07a0ab2f2e25e1b7bc3e3aac" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga5">stp_interface_age</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac">stp_interface_age</a>          </td>
         </tr>
       </table>
     </td>
@@ -359,13 +368,13 @@ The library ABI interface age number (number of revisions of this ABI).
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga0"></a><!-- doxytag: member="gutenprint-version.h::stp_major_version" ref="ga0" args="" --><p>
+<a class="anchor" name="g19a4efe48689fb8f859d04e60bfe028f"></a><!-- doxytag: member="gutenprint-version.h::stp_major_version" ref="g19a4efe48689fb8f859d04e60bfe028f" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga0">stp_major_version</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#g19a4efe48689fb8f859d04e60bfe028f">stp_major_version</a>          </td>
         </tr>
       </table>
     </td>
@@ -384,13 +393,13 @@ The library major version number.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga2"></a><!-- doxytag: member="gutenprint-version.h::stp_micro_version" ref="ga2" args="" --><p>
+<a class="anchor" name="g24960731fb86305c31f0be5621ccb993"></a><!-- doxytag: member="gutenprint-version.h::stp_micro_version" ref="g24960731fb86305c31f0be5621ccb993" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga2">stp_micro_version</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#g24960731fb86305c31f0be5621ccb993">stp_micro_version</a>          </td>
         </tr>
       </table>
     </td>
@@ -409,13 +418,13 @@ The library micro version number.
     </td>
   </tr>
 </table>
-<a class="anchor" name="ga1"></a><!-- doxytag: member="gutenprint-version.h::stp_minor_version" ref="ga1" args="" --><p>
+<a class="anchor" name="g66def32167cee385762282e36b60d3b7"></a><!-- doxytag: member="gutenprint-version.h::stp_minor_version" ref="g66def32167cee385762282e36b60d3b7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#ga1">stp_minor_version</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned int <a class="el" href="group__version.html#g66def32167cee385762282e36b60d3b7">stp_minor_version</a>          </td>
         </tr>
       </table>
     </td>
@@ -434,8 +443,8 @@ The library minor version number.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl-internal_8h.html b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
index 8a2731f..81f3ee8 100644
--- a/doc/gutenprint/html/gutenprint-intl-internal_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl-internal_8h.html
@@ -2,37 +2,51 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-intl-internal.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>gutenprint-intl-internal.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;locale.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gac0316f33cabc5a70d974c5aba43063b">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#geb8333d9b46653f2047c603034d26730">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g7fd6ec2ffaa95339754232b69eaac521">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g52d955a76a73f0e86dddd07dda5cd490">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gcf29daa2fef5f417c57be476054c695b">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#gd41443e9a10bd2ffa9508bb74c41c2d1">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl__internal.html#g9de9caf5267f08d8164404a1f68b66f5">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-intl_8h.html b/doc/gutenprint/html/gutenprint-intl_8h.html
index 68164b2..0a87444 100644
--- a/doc/gutenprint/html/gutenprint-intl_8h.html
+++ b/doc/gutenprint/html/gutenprint-intl_8h.html
@@ -2,37 +2,51 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-intl.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>gutenprint-intl.h File Reference</h1>Internationalisation functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;locale.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga0">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gac0316f33cabc5a70d974c5aba43063b">textdomain</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga1">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#geb8333d9b46653f2047c603034d26730">gettext</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga2">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g7fd6ec2ffaa95339754232b69eaac521">dgettext</a>(Domain, Message)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga3">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g52d955a76a73f0e86dddd07dda5cd490">dcgettext</a>(Domain, Message, Type)&nbsp;&nbsp;&nbsp;(Message)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga4">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gcf29daa2fef5f417c57be476054c695b">bindtextdomain</a>(Domain, Directory)&nbsp;&nbsp;&nbsp;(Domain)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga5">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#gd41443e9a10bd2ffa9508bb74c41c2d1">_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#ga6">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__intl.html#g9de9caf5267f08d8164404a1f68b66f5">N_</a>(String)&nbsp;&nbsp;&nbsp;(String)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Internationalisation functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-module_8h.html b/doc/gutenprint/html/gutenprint-module_8h.html
index adb526e..b6d6c59 100644
--- a/doc/gutenprint/html/gutenprint-module_8h.html
+++ b/doc/gutenprint/html/gutenprint-module_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-module.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>gutenprint-module.h File Reference</h1>Gutenprint module header. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="gutenprint_8h.html">gutenprint/gutenprint.h</a>&gt;</code><br>
@@ -22,14 +36,14 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html#a0">STP_MODULE</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprint-module_8h.html#47eb7c01a3f89d34af8ea0b2c9ca32a1">STP_MODULE</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Gutenprint module header. 
 <p>
-This header includes all of the public headers used by modules.<hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="gutenprint-module.h::STP_MODULE" ref="a0" args="" --><p>
+This header includes all of the public headers used by modules. <hr><h2>Define Documentation</h2>
+<a class="anchor" name="47eb7c01a3f89d34af8ea0b2c9ca32a1"></a><!-- doxytag: member="gutenprint-module.h::STP_MODULE" ref="47eb7c01a3f89d34af8ea0b2c9ca32a1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -52,8 +66,8 @@ This header includes all of the public headers used by modules.<hr><h2>Define Do
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint-version_8h.html b/doc/gutenprint/html/gutenprint-version_8h.html
index 980da4a..a9be052 100644
--- a/doc/gutenprint/html/gutenprint-version_8h.html
+++ b/doc/gutenprint/html/gutenprint-version_8h.html
@@ -2,59 +2,73 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint-version.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>gutenprint-version.h File Reference</h1>Version functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga7">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g98b05dcc61492d413bb01421995f1421">STP_MAJOR_VERSION</a>&nbsp;&nbsp;&nbsp;(5)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga8">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g26319655da45e42c3b498ae7db0bf62c">STP_MINOR_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga9">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g02b38fef35caed8b676941e8dd8aadae">STP_MICRO_VERSION</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga10">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g08cdc7e05ec4d52b2458470b6d0047fb">STP_CURRENT_INTERFACE</a>&nbsp;&nbsp;&nbsp;(2)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga11">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ge754fd2fde377ba0bbe61aee1a31dd9a">STP_BINARY_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga12">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gfd63347e8d3a71fa8384db59deabbde5">STP_INTERFACE_AGE</a>&nbsp;&nbsp;&nbsp;(0)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga13">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g26c662a55c391d11663052ca39458972">STP_CHECK_VERSION</a>(major, minor, micro)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga6">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g888f2f6268a658d1a6b71b5288299488">stp_check_version</a> (unsigned int required_major, unsigned int required_minor, unsigned int required_micro)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="group__version.html#ga6"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check whether the library provides the requested version.  <a href="group__version.html#g888f2f6268a658d1a6b71b5288299488"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga0">stp_major_version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g19a4efe48689fb8f859d04e60bfe028f">stp_major_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="group__version.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga1">stp_minor_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library major version number.  <a href="group__version.html#g19a4efe48689fb8f859d04e60bfe028f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g66def32167cee385762282e36b60d3b7">stp_minor_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="group__version.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga2">stp_micro_version</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library minor version number.  <a href="group__version.html#g66def32167cee385762282e36b60d3b7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g24960731fb86305c31f0be5621ccb993">stp_micro_version</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="group__version.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga3">stp_current_interface</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library micro version number.  <a href="group__version.html#g24960731fb86305c31f0be5621ccb993"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc">stp_current_interface</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="group__version.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga4">stp_binary_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI revision number (number of incompatible revisions).  <a href="group__version.html#g78c76c5831f5046eee8a56bd010b24dc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0">stp_binary_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="group__version.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#ga5">stp_interface_age</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI binary age number (number of forward-compatible revisions).  <a href="group__version.html#g97878c63aacb7d1fa8eed6cf1168c2e0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac">stp_interface_age</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The library ABI interface age number (number of revisions of this ABI).  <a href="group__version.html#gf242f39e07a0ab2f2e25e1b7bc3e3aac"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Version functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/gutenprint_8h.html b/doc/gutenprint/html/gutenprint_8h.html
index 7dde458..7991ae3 100644
--- a/doc/gutenprint/html/gutenprint_8h.html
+++ b/doc/gutenprint/html/gutenprint_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/gutenprint.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>gutenprint.h File Reference</h1>Gutenprint master header. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;stddef.h&gt;</code><br>
@@ -27,8 +41,8 @@
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Gutenprint master header. 
 <p>
-This header includes all of the public headers.<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+This header includes all of the public headers. <hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/image_8h.html b/doc/gutenprint/html/image_8h.html
index ee6c078..2f7de76 100644
--- a/doc/gutenprint/html/image_8h.html
+++ b/doc/gutenprint/html/image_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/image.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>image.h File Reference</h1>Image functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -16,39 +30,39 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="structstp__image.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga16">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gf71d7111a7215d4c1f1ef1317f9d6cfc">STP_CHANNEL_LIMIT</a>&nbsp;&nbsp;&nbsp;(32)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga7">stp_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__image.html">stp_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gc5b6b70cd39959ffd06deab3724d87e9">stp_image_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#ga7"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The image type is an abstract data type for interfacing with the image creation program.  <a href="group__image.html#gc5b6b70cd39959ffd06deab3724d87e9"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga17">stp_image_status_t</a> { <a class="el" href="group__image.html#gga17a2">STP_IMAGE_STATUS_OK</a>, 
-<a class="el" href="group__image.html#gga17a8">STP_IMAGE_STATUS_ABORT</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a> { <a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78fdb52f3f6f50b5f9f5b7b4865ef53a0e5">STP_IMAGE_STATUS_OK</a>, 
+<a class="el" href="group__image.html#gg3378dd231cc63da06de0bb41f1cde78f95f8e327aa422a832229d360dae7581b">STP_IMAGE_STATUS_ABORT</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#ga17">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Image status.  <a href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga9">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g74c2417d571861506be7209421a3b418">stp_image_init</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga10">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g69cd20ccb54500d0ee8cf38969db69a6">stp_image_reset</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga11">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g9ee4915d4a1007f2d9c730ddc96d931b">stp_image_width</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga12">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#g48a99a9a8493b75687ad0900664ca4cb">stp_image_height</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga17">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga13">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gfc93a7a3f6629f6826bf1f6f757f464e">stp_image_get_row</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image, unsigned char *data, size_t limit, int row)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga14">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd36123431e93e049d813894aa039c25c">stp_image_get_appname</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga15">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#gd1017f2f9b91d7add73c2393d96f700a">stp_image_conclude</a> (<a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Image functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/index.html b/doc/gutenprint/html/index.html
index 210f2eb..f9cae59 100644
--- a/doc/gutenprint/html/index.html
+++ b/doc/gutenprint/html/index.html
@@ -2,13 +2,22 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Main Page</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference Documentation</h1>
 <p>
-<h3 align="center">5.0.0-rc1 </h3><hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<h3 align="center">5.0.0-rc2 </h3><hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/list_8h.html b/doc/gutenprint/html/list_8h.html
index 6b52ea6..470db26 100644
--- a/doc/gutenprint/html/list_8h.html
+++ b/doc/gutenprint/html/list_8h.html
@@ -2,119 +2,133 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/list.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>list.h File Reference</h1>Generic list functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga0">stp_list_item_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list_item&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga1">stp_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list item opaque data type.  <a href="group__list.html#g71c64aeca8ca0613215306f088b6a963"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="group__list.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The list opaque data type.  <a href="group__list.html#g01be7c3ea8c46226978010d453016f22"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a> )(void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="group__list.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to free the data a node contains.  <a href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a> )(const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="group__list.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a> )(const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to copy the data a node contains.  <a href="group__list.html#g589c7c30b003d694b844834a41a6b1fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> )(const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="group__list.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to get the name of a node.  <a href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a> )(const void *, const void *)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="group__list.html#ga5"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A callback function to compare two nodes.  <a href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga6">stp_list_node_free_data</a> (void *item)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gb357e17f729e41b4f96d6aada1be26b9">stp_list_node_free_data</a> (void *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="group__list.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga7">stp_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Free node data allocated with stp_malloc.  <a href="group__list.html#gb357e17f729e41b4f96d6aada1be26b9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gaf10e4bb8ce6a8b6f5f015475400eb1b">stp_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="group__list.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga8">stp_list_copy</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list object.  <a href="group__list.html#gaf10e4bb8ce6a8b6f5f015475400eb1b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g3bd2f5a42d3313287017bfe20859c2d9">stp_list_copy</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="group__list.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga9">stp_list_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a list object.  <a href="group__list.html#g3bd2f5a42d3313287017bfe20859c2d9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g1382e926901b5efa2356176826a96a1a">stp_list_destroy</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="group__list.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga10">stp_list_get_start</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list object.  <a href="group__list.html#g1382e926901b5efa2356176826a96a1a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga67c8173f8c7b2c40e3d6dde6578faec">stp_list_get_start</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="group__list.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga11">stp_list_get_end</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the first item in a list.  <a href="group__list.html#ga67c8173f8c7b2c40e3d6dde6578faec"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g2ef0298e970fdb93955860e7ee3f878c">stp_list_get_end</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="group__list.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga12">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find the last item in a list.  <a href="group__list.html#g2ef0298e970fdb93955860e7ee3f878c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g9885458dd0f6e6fe5c88c4b2b0643e2a">stp_list_get_item_by_index</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="group__list.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga13">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its index.  <a href="group__list.html#g9885458dd0f6e6fe5c88c4b2b0643e2a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g0fd0ea2439ab2b0c9b9fb97f14c9a470">stp_list_get_item_by_name</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="group__list.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga14">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its name.  <a href="group__list.html#g0fd0ea2439ab2b0c9b9fb97f14c9a470"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gdbf12ab6f47d68f2605f211023c4f520">stp_list_get_item_by_long_name</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="group__list.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga15">stp_list_get_length</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find an item in a list by its long name.  <a href="group__list.html#gdbf12ab6f47d68f2605f211023c4f520"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g013ca40ec7e5714fc5ee5f31ac5582bc">stp_list_get_length</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="group__list.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga16">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga2">stp_node_freefunc</a> freefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the length of a list.  <a href="group__list.html#g013ca40ec7e5714fc5ee5f31ac5582bc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gc103cb4ff8870b3a8d90b6ebcade2498">stp_list_set_freefunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a> freefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="group__list.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga2">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga17">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node free function.  <a href="group__list.html#gc103cb4ff8870b3a8d90b6ebcade2498"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g3744d9043311d0bcbb21f80e79b9afba">stp_node_freefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g9d344e3c6874e6033f8fc71370678bcf">stp_list_get_freefunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="group__list.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga18">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga3">stp_node_copyfunc</a> copyfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node free function.  <a href="group__list.html#g9d344e3c6874e6033f8fc71370678bcf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gec59dd3b87efc811ef2b6303102ed279">stp_list_set_copyfunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a> copyfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="group__list.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga3">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga19">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node copy function.  <a href="group__list.html#gec59dd3b87efc811ef2b6303102ed279"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g589c7c30b003d694b844834a41a6b1fa">stp_node_copyfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g310dd79907494b07d9005fbf50b9eb0c">stp_list_get_copyfunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="group__list.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga20">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node copy function.  <a href="group__list.html#g310dd79907494b07d9005fbf50b9eb0c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g97d7c6d659aa7d05bc54a349a07e10c0">stp_list_set_namefunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="group__list.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga21">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node name function.  <a href="group__list.html#g97d7c6d659aa7d05bc54a349a07e10c0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g468cc0a5dfb1bfbef9eebd8d4f644492">stp_list_get_namefunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="group__list.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga22">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga4">stp_node_namefunc</a> long_namefunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node name function.  <a href="group__list.html#g468cc0a5dfb1bfbef9eebd8d4f644492"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g42bdba5fcb861bdf8facb9135039d9b8">stp_list_set_long_namefunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a> long_namefunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="group__list.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga4">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga23">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node long name function.  <a href="group__list.html#g42bdba5fcb861bdf8facb9135039d9b8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g1c6584d7cf0cda45dce5d95249af6470">stp_node_namefunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga95d8ace9b6ec71388007024c51865cb">stp_list_get_long_namefunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="group__list.html#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga24">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga5">stp_node_sortfunc</a> sortfunc)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node long name function.  <a href="group__list.html#ga95d8ace9b6ec71388007024c51865cb"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gbad08ce8ef257dae054ea3816ae88fe7">stp_list_set_sortfunc</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a> sortfunc)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="group__list.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga5">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga25">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#ga1">stp_list_t</a> *list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a list node sort function.  <a href="group__list.html#gbad08ce8ef257dae054ea3816ae88fe7"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#gd7ac92a42bf2184103e0a83147d1835f">stp_node_sortfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga759fd3cb97b9f651424b8a8fb6bedaa">stp_list_get_sortfunc</a> (const <a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="group__list.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga26">stp_list_item_create</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *next, const void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a list node sort function.  <a href="group__list.html#ga759fd3cb97b9f651424b8a8fb6bedaa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g50f49648801707436012cd5dc66b1f8c">stp_list_item_create</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *next, const void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="group__list.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga27">stp_list_item_destroy</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new list item.  <a href="group__list.html#g50f49648801707436012cd5dc66b1f8c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gde2acf279e8ea067fdc1f3f951d0b373">stp_list_item_destroy</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="group__list.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga28">stp_list_item_prev</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a list item.  <a href="group__list.html#gde2acf279e8ea067fdc1f3f951d0b373"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gcee23493eafdfcfce51e2ccf29ebbf54">stp_list_item_prev</a> (const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="group__list.html#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga29">stp_list_item_next</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the previous item in the list.  <a href="group__list.html#gcee23493eafdfcfce51e2ccf29ebbf54"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#gea9c1b6daae518ebecd2981289c555f3">stp_list_item_next</a> (const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="group__list.html#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga30">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the next item in the list.  <a href="group__list.html#gea9c1b6daae518ebecd2981289c555f3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g5b7d8ffea5a806953a43aee961a60fe4">stp_list_item_get_data</a> (const <a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="group__list.html#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#ga31">stp_list_item_set_data</a> (<a class="el" href="group__list.html#ga0">stp_list_item_t</a> *item, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data associated with a list item.  <a href="group__list.html#g5b7d8ffea5a806953a43aee961a60fe4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__list.html#g1b5d2889a81d712c3ba024e53bfd0f38">stp_list_item_set_data</a> (<a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *item, void *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#ga31"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data associated with a list item.  <a href="group__list.html#g1b5d2889a81d712c3ba024e53bfd0f38"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Generic list functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/module_8h.html b/doc/gutenprint/html/module_8h.html
index 821391f..244163d 100644
--- a/doc/gutenprint/html/module_8h.html
+++ b/doc/gutenprint/html/module_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/module.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>module.h File Reference</h1>Module functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
@@ -18,40 +32,40 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html">stp_module</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a0">stp_module_version_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module__version.html">stp_module_version</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a6058b6828d19e60a3e6c86b242da863">stp_module_version_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module.html">stp_module</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a1">stp_module_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__module.html">stp_module</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#1bc0723b8b43547b333980913ea42965">stp_module_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a13">stp_module_class_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="module_8h.html#a13a2">STP_MODULE_CLASS_INVALID</a>, 
-<a class="el" href="module_8h.html#a13a3">STP_MODULE_CLASS_MISC</a>, 
-<a class="el" href="module_8h.html#a13a4">STP_MODULE_CLASS_FAMILY</a>, 
-<a class="el" href="module_8h.html#a13a5">STP_MODULE_CLASS_COLOR</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452">STP_MODULE_CLASS_INVALID</a>, 
+<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01">STP_MODULE_CLASS_MISC</a>, 
+<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6">STP_MODULE_CLASS_FAMILY</a>, 
+<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0">STP_MODULE_CLASS_COLOR</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="module_8h.html#a13a6">STP_MODULE_CLASS_DITHER</a>
+&nbsp;&nbsp;<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c">STP_MODULE_CLASS_DITHER</a>
 <br>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a7">stp_module_load</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#b07deb48be35f70644fcc6013b4debd9">stp_module_load</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a8">stp_module_exit</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a5bfe6fda569e476ad52024d31eca3c4">stp_module_exit</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a9">stp_module_open</a> (const char *modulename)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#401000da13e2a7aacab2738838bf1fb2">stp_module_open</a> (const char *modulename)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a10">stp_module_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#8d52ac8df2ff7c4a28900fbb598c4848">stp_module_init</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a11">stp_module_close</a> (<a class="el" href="group__list.html#ga0">stp_list_item_t</a> *module)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#8e114f6e561ea2a5c4186b31eea363ad">stp_module_close</a> (<a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *module)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#a12">stp_module_get_class</a> (<a class="el" href="module_8h.html#a13">stp_module_class_t</a> class)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="module_8h.html#60ee652d3ddc0bf99abc8155b4e35a01">stp_module_get_class</a> (<a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a> class)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Module functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="module.h::stp_module_t" ref="a1" args="" --><p>
+<a class="anchor" name="1bc0723b8b43547b333980913ea42965"></a><!-- doxytag: member="module.h::stp_module_t" ref="1bc0723b8b43547b333980913ea42965" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -74,7 +88,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="a0" args="" --><p>
+<a class="anchor" name="a6058b6828d19e60a3e6c86b242da863"></a><!-- doxytag: member="module.h::stp_module_version_t" ref="a6058b6828d19e60a3e6c86b242da863" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -98,13 +112,13 @@ Module functions.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a13"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="a13" args="" --><p>
+<a class="anchor" name="df2656b9a248237bdf28247c133a046d"></a><!-- doxytag: member="module.h::stp_module_class_t" ref="df2656b9a248237bdf28247c133a046d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="module_8h.html#a13">stp_module_class_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -120,15 +134,15 @@ Module functions.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a13a2"></a><!-- doxytag: member="STP_MODULE_CLASS_INVALID" ref="a13a2" args="" -->STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452"></a><!-- doxytag: member="STP_MODULE_CLASS_INVALID" ref="df2656b9a248237bdf28247c133a046d3e5e52c14fb2598ee9f26fc2ac954452" args="" -->STP_MODULE_CLASS_INVALID</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a3"></a><!-- doxytag: member="STP_MODULE_CLASS_MISC" ref="a13a3" args="" -->STP_MODULE_CLASS_MISC</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01"></a><!-- doxytag: member="STP_MODULE_CLASS_MISC" ref="df2656b9a248237bdf28247c133a046dc2ba6cf4fb480d88b9cc46d218527c01" args="" -->STP_MODULE_CLASS_MISC</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a4"></a><!-- doxytag: member="STP_MODULE_CLASS_FAMILY" ref="a13a4" args="" -->STP_MODULE_CLASS_FAMILY</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6"></a><!-- doxytag: member="STP_MODULE_CLASS_FAMILY" ref="df2656b9a248237bdf28247c133a046d109d3cf2d0d4a476e0e488b3c482bea6" args="" -->STP_MODULE_CLASS_FAMILY</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a5"></a><!-- doxytag: member="STP_MODULE_CLASS_COLOR" ref="a13a5" args="" -->STP_MODULE_CLASS_COLOR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0"></a><!-- doxytag: member="STP_MODULE_CLASS_COLOR" ref="df2656b9a248237bdf28247c133a046d8fffd27ac2f7e9a5a5eec77a2cec8ad0" args="" -->STP_MODULE_CLASS_COLOR</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a13a6"></a><!-- doxytag: member="STP_MODULE_CLASS_DITHER" ref="a13a6" args="" -->STP_MODULE_CLASS_DITHER</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c"></a><!-- doxytag: member="STP_MODULE_CLASS_DITHER" ref="df2656b9a248237bdf28247c133a046d47128dd421ef22c57a852b5157b3627c" args="" -->STP_MODULE_CLASS_DITHER</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -136,7 +150,7 @@ Module functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a11"></a><!-- doxytag: member="module.h::stp_module_close" ref="a11" args="(stp_list_item_t *module)" --><p>
+<a class="anchor" name="8e114f6e561ea2a5c4186b31eea363ad"></a><!-- doxytag: member="module.h::stp_module_close" ref="8e114f6e561ea2a5c4186b31eea363ad" args="(stp_list_item_t *module)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -144,7 +158,7 @@ Module functions.
         <tr>
           <td class="md" nowrap valign="top">int stp_module_close           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga0">stp_list_item_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g71c64aeca8ca0613215306f088b6a963">stp_list_item_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>module</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -164,7 +178,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="module.h::stp_module_exit" ref="a8" args="(void)" --><p>
+<a class="anchor" name="a5bfe6fda569e476ad52024d31eca3c4"></a><!-- doxytag: member="module.h::stp_module_exit" ref="a5bfe6fda569e476ad52024d31eca3c4" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -192,15 +206,15 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="a12" args="(stp_module_class_t class)" --><p>
+<a class="anchor" name="60ee652d3ddc0bf99abc8155b4e35a01"></a><!-- doxytag: member="module.h::stp_module_get_class" ref="60ee652d3ddc0bf99abc8155b4e35a01" args="(stp_module_class_t class)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_module_get_class           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_module_get_class           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="module_8h.html#a13">stp_module_class_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a>&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>class</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -220,7 +234,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="module.h::stp_module_init" ref="a10" args="(void)" --><p>
+<a class="anchor" name="8d52ac8df2ff7c4a28900fbb598c4848"></a><!-- doxytag: member="module.h::stp_module_init" ref="8d52ac8df2ff7c4a28900fbb598c4848" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -248,7 +262,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="module.h::stp_module_load" ref="a7" args="(void)" --><p>
+<a class="anchor" name="b07deb48be35f70644fcc6013b4debd9"></a><!-- doxytag: member="module.h::stp_module_load" ref="b07deb48be35f70644fcc6013b4debd9" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -276,7 +290,7 @@ Module functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="module.h::stp_module_open" ref="a9" args="(const char *modulename)" --><p>
+<a class="anchor" name="401000da13e2a7aacab2738838bf1fb2"></a><!-- doxytag: member="module.h::stp_module_open" ref="401000da13e2a7aacab2738838bf1fb2" args="(const char *modulename)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -304,8 +318,8 @@ Module functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/modules.html b/doc/gutenprint/html/modules.html
index 8d282f6..fe35819 100644
--- a/doc/gutenprint/html/modules.html
+++ b/doc/gutenprint/html/modules.html
@@ -2,9 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Module Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindexHL" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference Modules</h1>Here is a list of all modules:<ul>
 <li><a class="el" href="group__array.html">array</a>
 <li><a class="el" href="group__color.html">color</a>
@@ -20,8 +29,8 @@
 <li><a class="el" href="group__util.html">util</a>
 <li><a class="el" href="group__vars.html">vars</a>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/mxml_8h.html b/doc/gutenprint/html/mxml_8h.html
index 98b7f9f..857fdf1 100644
--- a/doc/gutenprint/html/mxml_8h.html
+++ b/doc/gutenprint/html/mxml_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/mxml.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>mxml.h File Reference</h1>Mini-XML XML parsing functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;stdio.h&gt;</code><br>
@@ -28,101 +42,101 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a0">STP_MXML_WRAP</a>&nbsp;&nbsp;&nbsp;70</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#76508c60800b84b90acf4e0f8e04288e">STP_MXML_WRAP</a>&nbsp;&nbsp;&nbsp;70</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a1">STP_MXML_TAB</a>&nbsp;&nbsp;&nbsp;8</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#24760270636887d4dbbccca15164f4eb">STP_MXML_TAB</a>&nbsp;&nbsp;&nbsp;8</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a2">STP_MXML_NO_CALLBACK</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#70032c4eda848436305b71f40cf913f7">STP_MXML_NO_CALLBACK</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a3">STP_MXML_NO_PARENT</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#934b8d5744f37ba24d529a86f6e5f2e7">STP_MXML_NO_PARENT</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a4">STP_MXML_DESCEND</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#2ed08f4813ad57773f412970856517f5">STP_MXML_DESCEND</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a5">STP_MXML_NO_DESCEND</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#42831d4e1a69e57461d655f610bb995a">STP_MXML_NO_DESCEND</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a6">STP_MXML_DESCEND_FIRST</a>&nbsp;&nbsp;&nbsp;-1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#2692b08783d224aa4f726b13c4a7da68">STP_MXML_DESCEND_FIRST</a>&nbsp;&nbsp;&nbsp;-1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a7">STP_MXML_WS_BEFORE_OPEN</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#85b05ecef2dd56e2d66b0c3057705a9b">STP_MXML_WS_BEFORE_OPEN</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a8">STP_MXML_WS_AFTER_OPEN</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#312f2553f5c5e2f974ca8f238064dadd">STP_MXML_WS_AFTER_OPEN</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a9">STP_MXML_WS_BEFORE_CLOSE</a>&nbsp;&nbsp;&nbsp;2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#5ef0809e92527718236cf91e591f1276">STP_MXML_WS_BEFORE_CLOSE</a>&nbsp;&nbsp;&nbsp;2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a10">STP_MXML_WS_AFTER_CLOSE</a>&nbsp;&nbsp;&nbsp;3</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1ffe9b0d18eb95e8b85da3d09b195aee">STP_MXML_WS_AFTER_CLOSE</a>&nbsp;&nbsp;&nbsp;3</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a11">STP_MXML_ADD_BEFORE</a>&nbsp;&nbsp;&nbsp;0</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7ac1110fe031c1c8274171dda7c65ee8">STP_MXML_ADD_BEFORE</a>&nbsp;&nbsp;&nbsp;0</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a12">STP_MXML_ADD_AFTER</a>&nbsp;&nbsp;&nbsp;1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#aef62f3dd5005be25edf46856ffd0e67">STP_MXML_ADD_AFTER</a>&nbsp;&nbsp;&nbsp;1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a13">STP_MXML_ADD_TO_PARENT</a>&nbsp;&nbsp;&nbsp;NULL</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7183b4ceb133647a5b559de1549356d1">STP_MXML_ADD_TO_PARENT</a>&nbsp;&nbsp;&nbsp;NULL</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef enum <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1">stp_mxml_type_e</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a15">stp_mxml_attr_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1ed814dbc1628ca237bed68e27043438">stp_mxml_attr_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a16">stp_mxml_element_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__value__s.html">stp_mxml_value_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#504a90f35ed408a7f80f6dbdadf45ae4">stp_mxml_element_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a17">stp_mxml_text_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a2b9c7f1c79258abe63be05529b2a908">stp_mxml_text_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a18">stp_mxml_value_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_u</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#d162e4b65493580e8bee75ef0c8c12b6">stp_mxml_value_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a19">stp_mxml_node_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_s</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#1d1a605dff310b7538b297c8e63b1d88">stp_mxml_node_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a> { <br>
-&nbsp;&nbsp;<a class="el" href="mxml_8h.html#a43a20">STP_MXML_ELEMENT</a>, 
-<a class="el" href="mxml_8h.html#a43a21">STP_MXML_INTEGER</a>, 
-<a class="el" href="mxml_8h.html#a43a22">STP_MXML_OPAQUE</a>, 
-<a class="el" href="mxml_8h.html#a43a23">STP_MXML_REAL</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1">stp_mxml_type_e</a> { <br>
+&nbsp;&nbsp;<a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0">STP_MXML_ELEMENT</a>, 
+<a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092">STP_MXML_INTEGER</a>, 
+<a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d">STP_MXML_OPAQUE</a>, 
+<a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d">STP_MXML_REAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="mxml_8h.html#a43a24">STP_MXML_TEXT</a>
+&nbsp;&nbsp;<a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6">STP_MXML_TEXT</a>
 <br>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a25">stp_mxmlAdd</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int where, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *child, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#f5b1214c9e580debaf0350f31d03467d">stp_mxmlAdd</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int where, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *child, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a26">stp_mxmlDelete</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#cbdf0579701e7776af87fbb3c2bf9469">stp_mxmlDelete</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a27">stp_mxmlElementGetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#23f0ed075c389d9681fb5ed3c2ecddb9">stp_mxmlElementGetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a28">stp_mxmlElementSetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name, const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#eae678d773da3b4075f1feea1b14eb84">stp_mxmlElementSetAttr</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *name, const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a29">stp_mxmlFindElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *name, const char *attr, const char *value, int descend)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7c0efd099878ce90b220bf4c51324cce">stp_mxmlFindElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *name, const char *attr, const char *value, int descend)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a30">stp_mxmlLoadFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#db392c4e623e72d2b1985058564abf5d">stp_mxmlLoadFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, FILE *fp, <a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a31">stp_mxmlLoadString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#9e275680a5730ef159757b20e041723d">stp_mxmlLoadString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, const char *s, <a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a32">stp_mxmlNewElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#305b60c2a9554ac30bb195e42cc82e75">stp_mxmlNewElement</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a33">stp_mxmlNewInteger</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int integer)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#e65d5658c5271a9e26c5a21bc0cc2f20">stp_mxmlNewInteger</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int integer)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a34">stp_mxmlNewOpaque</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *opaque)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#533ea6ec53f37f8bdd2d89d667b0d10a">stp_mxmlNewOpaque</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, const char *opaque)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a35">stp_mxmlNewReal</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, double real)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#7754bd0d9af2be6edaeac7edf9c89c93">stp_mxmlNewReal</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, double real)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a36">stp_mxmlNewText</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int whitespace, const char *string)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#41566f9adbe5fe307a4643e073e3d914">stp_mxmlNewText</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *parent, int whitespace, const char *string)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a37">stp_mxmlRemove</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#6abe55831d77332db6b94b6cc0caaf02">stp_mxmlRemove</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a38">stp_mxmlSaveAllocString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#e3723cad1353a2142fc1abaee599380c">stp_mxmlSaveAllocString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a39">stp_mxmlSaveFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#bfabbd9dfdce248edc2f47de1faee7c3">stp_mxmlSaveFile</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, FILE *fp, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a40">stp_mxmlSaveString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#18d0fb42d5adb6b4337df82e61116050">stp_mxmlSaveString</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, char *buffer, int bufsize, int(*cb)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *, int))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a41">stp_mxmlWalkNext</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#be88dab827e68c48b822c6250731fc57">stp_mxmlWalkNext</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#a42">stp_mxmlWalkPrev</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="mxml_8h.html#112485e5f15808619af7dd558528323f">stp_mxmlWalkPrev</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, <a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *top, int descend)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Mini-XML XML parsing functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a12"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="a12" args="" --><p>
+<a class="anchor" name="aef62f3dd5005be25edf46856ffd0e67"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_AFTER" ref="aef62f3dd5005be25edf46856ffd0e67" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -145,7 +159,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="a11" args="" --><p>
+<a class="anchor" name="7ac1110fe031c1c8274171dda7c65ee8"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_BEFORE" ref="7ac1110fe031c1c8274171dda7c65ee8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -168,7 +182,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="a13" args="" --><p>
+<a class="anchor" name="7183b4ceb133647a5b559de1549356d1"></a><!-- doxytag: member="mxml.h::STP_MXML_ADD_TO_PARENT" ref="7183b4ceb133647a5b559de1549356d1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -191,7 +205,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="a4" args="" --><p>
+<a class="anchor" name="2ed08f4813ad57773f412970856517f5"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND" ref="2ed08f4813ad57773f412970856517f5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -214,7 +228,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="a6" args="" --><p>
+<a class="anchor" name="2692b08783d224aa4f726b13c4a7da68"></a><!-- doxytag: member="mxml.h::STP_MXML_DESCEND_FIRST" ref="2692b08783d224aa4f726b13c4a7da68" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -237,7 +251,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="a2" args="" --><p>
+<a class="anchor" name="70032c4eda848436305b71f40cf913f7"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_CALLBACK" ref="70032c4eda848436305b71f40cf913f7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -260,7 +274,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="a5" args="" --><p>
+<a class="anchor" name="42831d4e1a69e57461d655f610bb995a"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_DESCEND" ref="42831d4e1a69e57461d655f610bb995a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -283,7 +297,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="a3" args="" --><p>
+<a class="anchor" name="934b8d5744f37ba24d529a86f6e5f2e7"></a><!-- doxytag: member="mxml.h::STP_MXML_NO_PARENT" ref="934b8d5744f37ba24d529a86f6e5f2e7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -306,7 +320,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="a1" args="" --><p>
+<a class="anchor" name="24760270636887d4dbbccca15164f4eb"></a><!-- doxytag: member="mxml.h::STP_MXML_TAB" ref="24760270636887d4dbbccca15164f4eb" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -329,7 +343,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="a0" args="" --><p>
+<a class="anchor" name="76508c60800b84b90acf4e0f8e04288e"></a><!-- doxytag: member="mxml.h::STP_MXML_WRAP" ref="76508c60800b84b90acf4e0f8e04288e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -352,7 +366,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="a10" args="" --><p>
+<a class="anchor" name="1ffe9b0d18eb95e8b85da3d09b195aee"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_CLOSE" ref="1ffe9b0d18eb95e8b85da3d09b195aee" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -375,7 +389,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="a8" args="" --><p>
+<a class="anchor" name="312f2553f5c5e2f974ca8f238064dadd"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_AFTER_OPEN" ref="312f2553f5c5e2f974ca8f238064dadd" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -398,7 +412,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="a9" args="" --><p>
+<a class="anchor" name="5ef0809e92527718236cf91e591f1276"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_CLOSE" ref="5ef0809e92527718236cf91e591f1276" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -421,7 +435,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="a7" args="" --><p>
+<a class="anchor" name="85b05ecef2dd56e2d66b0c3057705a9b"></a><!-- doxytag: member="mxml.h::STP_MXML_WS_BEFORE_OPEN" ref="85b05ecef2dd56e2d66b0c3057705a9b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -445,7 +459,7 @@ Mini-XML XML parsing functions.
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a15"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="a15" args="" --><p>
+<a class="anchor" name="1ed814dbc1628ca237bed68e27043438"></a><!-- doxytag: member="mxml.h::stp_mxml_attr_t" ref="1ed814dbc1628ca237bed68e27043438" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -468,7 +482,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="a16" args="" --><p>
+<a class="anchor" name="504a90f35ed408a7f80f6dbdadf45ae4"></a><!-- doxytag: member="mxml.h::stp_mxml_element_t" ref="504a90f35ed408a7f80f6dbdadf45ae4" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -491,7 +505,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="a19" args="" --><p>
+<a class="anchor" name="1d1a605dff310b7538b297c8e63b1d88"></a><!-- doxytag: member="mxml.h::stp_mxml_node_t" ref="1d1a605dff310b7538b297c8e63b1d88" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -514,7 +528,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="a17" args="" --><p>
+<a class="anchor" name="a2b9c7f1c79258abe63be05529b2a908"></a><!-- doxytag: member="mxml.h::stp_mxml_text_t" ref="a2b9c7f1c79258abe63be05529b2a908" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -537,13 +551,13 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="a14" args="" --><p>
+<a class="anchor" name="1ed6fadf477121e16a83bc1899c30d5c"></a><!-- doxytag: member="mxml.h::stp_mxml_type_t" ref="1ed6fadf477121e16a83bc1899c30d5c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>  <a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef enum <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1">stp_mxml_type_e</a>  <a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -560,7 +574,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="a18" args="" --><p>
+<a class="anchor" name="d162e4b65493580e8bee75ef0c8c12b6"></a><!-- doxytag: member="mxml.h::stp_mxml_value_t" ref="d162e4b65493580e8bee75ef0c8c12b6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -584,13 +598,13 @@ Mini-XML XML parsing functions.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a43"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="a43" args="" --><p>
+<a class="anchor" name="dc40006361fa674950bded00ecfe2af1"></a><!-- doxytag: member="mxml.h::stp_mxml_type_e" ref="dc40006361fa674950bded00ecfe2af1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="mxml_8h.html#a43">stp_mxml_type_e</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="mxml_8h.html#dc40006361fa674950bded00ecfe2af1">stp_mxml_type_e</a>          </td>
         </tr>
       </table>
     </td>
@@ -606,15 +620,15 @@ Mini-XML XML parsing functions.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a43a20"></a><!-- doxytag: member="STP_MXML_ELEMENT" ref="a43a20" args="" -->STP_MXML_ELEMENT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0"></a><!-- doxytag: member="STP_MXML_ELEMENT" ref="dc40006361fa674950bded00ecfe2af14ba5265c3afb36dd232d06654057b5e0" args="" -->STP_MXML_ELEMENT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a21"></a><!-- doxytag: member="STP_MXML_INTEGER" ref="a43a21" args="" -->STP_MXML_INTEGER</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092"></a><!-- doxytag: member="STP_MXML_INTEGER" ref="dc40006361fa674950bded00ecfe2af1956325ecfc4010c94a12c6b27a4f6092" args="" -->STP_MXML_INTEGER</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a22"></a><!-- doxytag: member="STP_MXML_OPAQUE" ref="a43a22" args="" -->STP_MXML_OPAQUE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d"></a><!-- doxytag: member="STP_MXML_OPAQUE" ref="dc40006361fa674950bded00ecfe2af1c584cda537b2d2dbf925771121783f2d" args="" -->STP_MXML_OPAQUE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a23"></a><!-- doxytag: member="STP_MXML_REAL" ref="a43a23" args="" -->STP_MXML_REAL</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d"></a><!-- doxytag: member="STP_MXML_REAL" ref="dc40006361fa674950bded00ecfe2af13ab4fa5909280fe38cd797602bbde38d" args="" -->STP_MXML_REAL</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a43a24"></a><!-- doxytag: member="STP_MXML_TEXT" ref="a43a24" args="" -->STP_MXML_TEXT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6"></a><!-- doxytag: member="STP_MXML_TEXT" ref="dc40006361fa674950bded00ecfe2af1327390d3a536298d1c0a4da5f8a26fb6" args="" -->STP_MXML_TEXT</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -622,7 +636,7 @@ Mini-XML XML parsing functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a25"></a><!-- doxytag: member="mxml.h::stp_mxmlAdd" ref="a25" args="(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)" --><p>
+<a class="anchor" name="f5b1214c9e580debaf0350f31d03467d"></a><!-- doxytag: member="mxml.h::stp_mxmlAdd" ref="f5b1214c9e580debaf0350f31d03467d" args="(stp_mxml_node_t *parent, int where, stp_mxml_node_t *child, stp_mxml_node_t *node)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -671,7 +685,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a26"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="a26" args="(stp_mxml_node_t *node)" --><p>
+<a class="anchor" name="cbdf0579701e7776af87fbb3c2bf9469"></a><!-- doxytag: member="mxml.h::stp_mxmlDelete" ref="cbdf0579701e7776af87fbb3c2bf9469" args="(stp_mxml_node_t *node)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -699,7 +713,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a27"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="a27" args="(stp_mxml_node_t *node, const char *name)" --><p>
+<a class="anchor" name="23f0ed075c389d9681fb5ed3c2ecddb9"></a><!-- doxytag: member="mxml.h::stp_mxmlElementGetAttr" ref="23f0ed075c389d9681fb5ed3c2ecddb9" args="(stp_mxml_node_t *node, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -736,7 +750,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a28"></a><!-- doxytag: member="mxml.h::stp_mxmlElementSetAttr" ref="a28" args="(stp_mxml_node_t *node, const char *name, const char *value)" --><p>
+<a class="anchor" name="eae678d773da3b4075f1feea1b14eb84"></a><!-- doxytag: member="mxml.h::stp_mxmlElementSetAttr" ref="eae678d773da3b4075f1feea1b14eb84" args="(stp_mxml_node_t *node, const char *name, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -779,7 +793,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a29"></a><!-- doxytag: member="mxml.h::stp_mxmlFindElement" ref="a29" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)" --><p>
+<a class="anchor" name="7c0efd099878ce90b220bf4c51324cce"></a><!-- doxytag: member="mxml.h::stp_mxmlFindElement" ref="7c0efd099878ce90b220bf4c51324cce" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, const char *name, const char *attr, const char *value, int descend)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -840,7 +854,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a30"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFile" ref="a30" args="(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" --><p>
+<a class="anchor" name="db392c4e623e72d2b1985058564abf5d"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadFile" ref="db392c4e623e72d2b1985058564abf5d" args="(stp_mxml_node_t *top, FILE *fp, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -860,7 +874,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
           <td class="mdname" nowrap> <em>cb</em></td>
         </tr>
         <tr>
@@ -883,7 +897,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a31"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadString" ref="a31" args="(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" --><p>
+<a class="anchor" name="9e275680a5730ef159757b20e041723d"></a><!-- doxytag: member="mxml.h::stp_mxmlLoadString" ref="9e275680a5730ef159757b20e041723d" args="(stp_mxml_node_t *top, const char *s, stp_mxml_type_t(*cb)(stp_mxml_node_t *))" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -903,7 +917,7 @@ Mini-XML XML parsing functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>(*)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *)&nbsp;</td>
           <td class="mdname" nowrap> <em>cb</em></td>
         </tr>
         <tr>
@@ -926,7 +940,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a32"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="a32" args="(stp_mxml_node_t *parent, const char *name)" --><p>
+<a class="anchor" name="305b60c2a9554ac30bb195e42cc82e75"></a><!-- doxytag: member="mxml.h::stp_mxmlNewElement" ref="305b60c2a9554ac30bb195e42cc82e75" args="(stp_mxml_node_t *parent, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -963,7 +977,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a33"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="a33" args="(stp_mxml_node_t *parent, int integer)" --><p>
+<a class="anchor" name="e65d5658c5271a9e26c5a21bc0cc2f20"></a><!-- doxytag: member="mxml.h::stp_mxmlNewInteger" ref="e65d5658c5271a9e26c5a21bc0cc2f20" args="(stp_mxml_node_t *parent, int integer)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1000,7 +1014,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a34"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="a34" args="(stp_mxml_node_t *parent, const char *opaque)" --><p>
+<a class="anchor" name="533ea6ec53f37f8bdd2d89d667b0d10a"></a><!-- doxytag: member="mxml.h::stp_mxmlNewOpaque" ref="533ea6ec53f37f8bdd2d89d667b0d10a" args="(stp_mxml_node_t *parent, const char *opaque)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1037,7 +1051,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a35"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="a35" args="(stp_mxml_node_t *parent, double real)" --><p>
+<a class="anchor" name="7754bd0d9af2be6edaeac7edf9c89c93"></a><!-- doxytag: member="mxml.h::stp_mxmlNewReal" ref="7754bd0d9af2be6edaeac7edf9c89c93" args="(stp_mxml_node_t *parent, double real)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1074,7 +1088,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a36"></a><!-- doxytag: member="mxml.h::stp_mxmlNewText" ref="a36" args="(stp_mxml_node_t *parent, int whitespace, const char *string)" --><p>
+<a class="anchor" name="41566f9adbe5fe307a4643e073e3d914"></a><!-- doxytag: member="mxml.h::stp_mxmlNewText" ref="41566f9adbe5fe307a4643e073e3d914" args="(stp_mxml_node_t *parent, int whitespace, const char *string)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1117,7 +1131,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a37"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="a37" args="(stp_mxml_node_t *node)" --><p>
+<a class="anchor" name="6abe55831d77332db6b94b6cc0caaf02"></a><!-- doxytag: member="mxml.h::stp_mxmlRemove" ref="6abe55831d77332db6b94b6cc0caaf02" args="(stp_mxml_node_t *node)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1145,7 +1159,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a38"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveAllocString" ref="a38" args="(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))" --><p>
+<a class="anchor" name="e3723cad1353a2142fc1abaee599380c"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveAllocString" ref="e3723cad1353a2142fc1abaee599380c" args="(stp_mxml_node_t *node, int(*cb)(stp_mxml_node_t *, int))" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1182,7 +1196,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a39"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveFile" ref="a39" args="(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))" --><p>
+<a class="anchor" name="bfabbd9dfdce248edc2f47de1faee7c3"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveFile" ref="bfabbd9dfdce248edc2f47de1faee7c3" args="(stp_mxml_node_t *node, FILE *fp, int(*cb)(stp_mxml_node_t *, int))" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1225,7 +1239,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a40"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveString" ref="a40" args="(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))" --><p>
+<a class="anchor" name="18d0fb42d5adb6b4337df82e61116050"></a><!-- doxytag: member="mxml.h::stp_mxmlSaveString" ref="18d0fb42d5adb6b4337df82e61116050" args="(stp_mxml_node_t *node, char *buffer, int bufsize, int(*cb)(stp_mxml_node_t *, int))" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1274,7 +1288,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a41"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkNext" ref="a41" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" --><p>
+<a class="anchor" name="be88dab827e68c48b822c6250731fc57"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkNext" ref="be88dab827e68c48b822c6250731fc57" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1317,7 +1331,7 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a42"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkPrev" ref="a42" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" --><p>
+<a class="anchor" name="112485e5f15808619af7dd558528323f"></a><!-- doxytag: member="mxml.h::stp_mxmlWalkPrev" ref="112485e5f15808619af7dd558528323f" args="(stp_mxml_node_t *node, stp_mxml_node_t *top, int descend)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1360,8 +1374,8 @@ Mini-XML XML parsing functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/pages.html b/doc/gutenprint/html/pages.html
index a6370b7..cf711ee 100644
--- a/doc/gutenprint/html/pages.html
+++ b/doc/gutenprint/html/pages.html
@@ -2,15 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: Page Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindexHL" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li id="current"><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
 <h1>libgutenprint API Reference Related Pages</h1>Here is a list of all related documentation pages:<ul>
 <li><a class="el" href="deprecated.html">Deprecated List</a>
 
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/paper_8h.html b/doc/gutenprint/html/paper_8h.html
index 3a93b61..cef07ec 100644
--- a/doc/gutenprint/html/paper_8h.html
+++ b/doc/gutenprint/html/paper_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/paper.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>paper.h File Reference</h1>Paper size functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="vars_8h.html">gutenprint/vars.h</a>&gt;</code><br>
@@ -17,34 +31,34 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The papersize data type.  <a href="structstp__papersize__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#gga5a0">PAPERSIZE_ENGLISH_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a1">PAPERSIZE_METRIC_STANDARD</a>, 
-<a class="el" href="group__papersize.html#gga5a2">PAPERSIZE_ENGLISH_EXTENDED</a>, 
-<a class="el" href="group__papersize.html#gga5a3">PAPERSIZE_METRIC_EXTENDED</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a> { <a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89ab9ebd4635cba113d13b614cf59ba65">PAPERSIZE_ENGLISH_STANDARD</a>, 
+<a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d84ae9248078d3dc8056332456fa9e6e35">PAPERSIZE_METRIC_STANDARD</a>, 
+<a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d8d1fc48a2040060768c9b9ac53dc7f54d">PAPERSIZE_ENGLISH_EXTENDED</a>, 
+<a class="el" href="group__papersize.html#ggbb66a8f6ce85d70afd9fe42472b492d89868386c49c3598dace4f5283179592a">PAPERSIZE_METRIC_EXTENDED</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#ga5">More...</a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga0">stp_known_papersizes</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g93eb4d6bc44914b3ea6b184e076a0853">stp_known_papersizes</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="group__papersize.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga1">stp_get_papersize_by_name</a> (const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available papersizes.  <a href="group__papersize.html#g93eb4d6bc44914b3ea6b184e076a0853"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g9d655e3de6954ad3c5933dc736d2509a">stp_get_papersize_by_name</a> (const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="group__papersize.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga2">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by name.  <a href="group__papersize.html#g9d655e3de6954ad3c5933dc736d2509a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g0438b0e4729f37579900b591e801f8ce">stp_get_papersize_by_size</a> (int length, int width)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga3">stp_get_papersize_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by size.  <a href="group__papersize.html#g0438b0e4729f37579900b591e801f8ce"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__papersize__t.html">stp_papersize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g08bb891f58a7decfee2b073c00715993">stp_get_papersize_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#ga4">stp_default_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a papersize by its index number.  <a href="group__papersize.html#g08bb891f58a7decfee2b073c00715993"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__papersize.html#g2fe5d85acaa4ff8b8e4ad1ff3cccb027">stp_default_media_size</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Paper size functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/path_8h.html b/doc/gutenprint/html/path_8h.html
index bb6f646..bb6083c 100644
--- a/doc/gutenprint/html/path_8h.html
+++ b/doc/gutenprint/html/path_8h.html
@@ -2,34 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/path.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>path.h File Reference</h1>Simple directory path functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a0">stp_path_search</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#8591072873a5ee644a6dd22538d84c55">stp_path_search</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *dirlist, const char *suffix)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#a1">stp_path_split</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *list, const char *path)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="path_8h.html#bc40460305f1f4f972c08a439f406449">stp_path_split</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *list, const char *path)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Simple directory path functions. 
 <p>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="path.h::stp_path_search" ref="a0" args="(stp_list_t *dirlist, const char *suffix)" --><p>
+<a class="anchor" name="8591072873a5ee644a6dd22538d84c55"></a><!-- doxytag: member="path.h::stp_path_search" ref="8591072873a5ee644a6dd22538d84c55" args="(stp_list_t *dirlist, const char *suffix)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* stp_path_search           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* stp_path_search           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>dirlist</em>, </td>
         </tr>
         <tr>
@@ -58,7 +72,7 @@ Simple directory path functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="path.h::stp_path_split" ref="a1" args="(stp_list_t *list, const char *path)" --><p>
+<a class="anchor" name="bc40460305f1f4f972c08a439f406449"></a><!-- doxytag: member="path.h::stp_path_split" ref="bc40460305f1f4f972c08a439f406449" args="(stp_list_t *list, const char *path)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -66,7 +80,7 @@ Simple directory path functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_path_split           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -95,8 +109,8 @@ Simple directory path functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/printers_8h.html b/doc/gutenprint/html/printers_8h.html
index 62ab17e..ef20727 100644
--- a/doc/gutenprint/html/printers_8h.html
+++ b/doc/gutenprint/html/printers_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/printers.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>printers.h File Reference</h1>Printer functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="list_8h.html">gutenprint/list.h</a>&gt;</code><br>
@@ -19,82 +33,82 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html">stp_family</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga0">stp_printer_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_printer&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga1">stp_family_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The printer opaque data type (representation of printer model).  <a href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstp__family.html">stp_family</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g5c0458c3c1d19474e0245c47dac29e70">stp_family_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2">stp_printer_model_count</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc0a8108170f5c86621de14296fd94b1e">stp_printer_model_count</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="group__printer.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga3">stp_get_printer_by_index</a> (int idx)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the number of available printer models.  <a href="group__printer.html#gc0a8108170f5c86621de14296fd94b1e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g1286559c60d239563f9f15fdd27996e0">stp_get_printer_by_index</a> (int idx)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="group__printer.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga4">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its index number.  <a href="group__printer.html#g1286559c60d239563f9f15fdd27996e0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc041944e528afcb9a795eb6ece3fc6ff">stp_get_printer_by_long_name</a> (const char *long_name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="group__printer.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga5">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its long (translated) name.  <a href="group__printer.html#gc041944e528afcb9a795eb6ece3fc6ff"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g947fa230e08f9c854ca2608e76bd0d58">stp_get_printer_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="group__printer.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga6">stp_get_printer</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model by its short name.  <a href="group__printer.html#g947fa230e08f9c854ca2608e76bd0d58"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gcb4cdcada01ff29c5fd4ffeaa576db9e">stp_get_printer</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="group__printer.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga7">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer model from a vars object.  <a href="group__printer.html#gcb4cdcada01ff29c5fd4ffeaa576db9e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6f32b0213b580bf081fc8752a3eb04a1">stp_get_printer_index_by_driver</a> (const char *driver)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="group__printer.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga8">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the printer index number from the printer model short (driver) name.  <a href="group__printer.html#g6f32b0213b580bf081fc8752a3eb04a1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g00182878bdc39935e6382d7e41d55294">stp_printer_get_long_name</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="group__printer.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga9">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's long (translated) name.  <a href="group__printer.html#g00182878bdc39935e6382d7e41d55294"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g6c6c426f86307660079277ab6e90ae3d">stp_printer_get_driver</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="group__printer.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga10">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's short (driver) name.  <a href="group__printer.html#g6c6c426f86307660079277ab6e90ae3d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g9c98ccc58b2c6f9ed6bd1025220ff77d">stp_printer_get_family</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="group__printer.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga11">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's family name.  <a href="group__printer.html#g9c98ccc58b2c6f9ed6bd1025220ff77d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gfc0382fd32b49ea9d171e4ce8b750c62">stp_printer_get_manufacturer</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="group__printer.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga12">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's manufacturer's name.  <a href="group__printer.html#gfc0382fd32b49ea9d171e4ce8b750c62"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g7ba104f0ea5ce4a88175486894010b71">stp_printer_get_model</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="group__printer.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga13">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a printer model's model number.  <a href="group__printer.html#g7ba104f0ea5ce4a88175486894010b71"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ge67398e65540b835f5c5d073c5ea0ec1">stp_printer_get_defaults</a> (const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga14">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#ga0">stp_printer_t</a> *p)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the default vars for a particular printer model.  <a href="group__printer.html#ge67398e65540b835f5c5d073c5ea0ec1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc3d8cdb65382cb13ea6b01072e6240d5">stp_set_printer_defaults</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const <a class="el" href="group__printer.html#g1a68662b730d44c11de6fb8226a309f6">stp_printer_t</a> *p)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="group__printer.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga15">stp_print</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a vars object to use a particular driver, and set the parameter to its defaults.  <a href="group__printer.html#gc3d8cdb65382cb13ea6b01072e6240d5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g121125e6646c6f6d8965f1857450749e">stp_print</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga16">stp_start_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Print the image.  <a href="group__printer.html#g121125e6646c6f6d8965f1857450749e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g9cf59fba866430dd47508bac6561ef67">stp_start_job</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga17">stp_end_job</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Start a print job.  <a href="group__printer.html#g9cf59fba866430dd47508bac6561ef67"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g40637834f08a166992325af09f6a6030">stp_end_job</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga18">stp_get_model_id</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">End a print job.  <a href="group__printer.html#g40637834f08a166992325af09f6a6030"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc09e99e20c8a19a13a5fb6356742a92a">stp_get_model_id</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga19">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gd91f8e7a622725f0d47196cf912ddd8d">stp_verify_printer_params</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga20">stp_family_register</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g82b22438444849bdedb4cfbe22f209e8">stp_family_register</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga21">stp_family_unregister</a> (<a class="el" href="group__list.html#ga1">stp_list_t</a> *family)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga2ab30a5e5442b7a552fc3b884e1511b">stp_family_unregister</a> (<a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *family)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga22">stp_initialize_printer_defaults</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#gc9aba62164667822fd9f110740bab570">stp_initialize_printer_defaults</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga23">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g666486047edfe4405d003b5c3bbe4b49">stp_printer_list_parameters</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga24">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g806f00d4167762c7a3d467ec37c8430e">stp_printer_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#ga25">stp_describe_output</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__printer.html#g950e2cd193926440ba250dbc184d8588">stp_describe_output</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Printer functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/sequence_8h.html b/doc/gutenprint/html/sequence_8h.html
index 4a0e614..f07d513 100644
--- a/doc/gutenprint/html/sequence_8h.html
+++ b/doc/gutenprint/html/sequence_8h.html
@@ -2,110 +2,124 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/sequence.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>sequence.h File Reference</h1>Sequence functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_sequence&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#ga0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The sequence opaque data type.  <a href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga1">stp_sequence_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee">stp_sequence_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="group__sequence.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga2">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new sequence.  <a href="group__sequence.html#g771327bed5a71d8d33cc6b3ec5cbdbee"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g98c9c2859d2ebe9b1987d26b62bd6ce0">stp_sequence_destroy</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="group__sequence.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga3">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a sequence.  <a href="group__sequence.html#g98c9c2859d2ebe9b1987d26b62bd6ce0"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g5792d6f821525514199dd2d9b332ddd4">stp_sequence_copy</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *dest, const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="group__sequence.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga4">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy an sequence.  <a href="group__sequence.html#g5792d6f821525514199dd2d9b332ddd4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd37eb66db88ac93b853ba6e02b9155bc">stp_sequence_create_copy</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="group__sequence.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga5">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate an sequence.  <a href="group__sequence.html#gd37eb66db88ac93b853ba6e02b9155bc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd56df3112937c11431e033f2d9574b96">stp_sequence_set_bounds</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, double low, double high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="group__sequence.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga6">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the lower and upper bounds.  <a href="group__sequence.html#gd56df3112937c11431e033f2d9574b96"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g392e1da122d95d6fc07b6d73eff1d311">stp_sequence_get_bounds</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="group__sequence.html#ga6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga7">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the lower and upper bounds.  <a href="group__sequence.html#g392e1da122d95d6fc07b6d73eff1d311"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gc2c70c539a3eced45be306d082faa3a6">stp_sequence_get_range</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, double *low, double *high)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="group__sequence.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga8">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t size)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get range of values stored in the sequence.  <a href="group__sequence.html#gc2c70c539a3eced45be306d082faa3a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g166e9a610bd53cb812e328d9e111f240">stp_sequence_set_size</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t size)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="group__sequence.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga9">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the sequence size.  <a href="group__sequence.html#g166e9a610bd53cb812e328d9e111f240"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g99292c5ba10bcf1574c3e71a593c3e5f">stp_sequence_get_size</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="group__sequence.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga10">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the sequence size.  <a href="group__sequence.html#g99292c5ba10bcf1574c3e71a593c3e5f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g24024e771a50db02f2713b244212603e">stp_sequence_set_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="group__sequence.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga11">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence.  <a href="group__sequence.html#g24024e771a50db02f2713b244212603e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g9b41ba7e0f1fb00cf19bbb9efe70824d">stp_sequence_set_subrange</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t where, size_t size, const double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="group__sequence.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga12">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a subrange of a sequence.  <a href="group__sequence.html#g9b41ba7e0f1fb00cf19bbb9efe70824d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199">stp_sequence_get_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *size, const double **data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="group__sequence.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga13">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence.  <a href="group__sequence.html#gc33208fae031bd1111f8ceb4c1425199"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gf7f49101192387e29399ded6d3166d13">stp_sequence_set_point</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t where, double data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="group__sequence.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga14">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data at a single point in a sequence.  <a href="group__sequence.html#gf7f49101192387e29399ded6d3166d13"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g044210129f28c298152ce124371324d4">stp_sequence_get_point</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t where, double *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="group__sequence.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga15">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data at a single point in a sequence.  <a href="group__sequence.html#g044210129f28c298152ce124371324d4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g34a526cb5e72b611ac8a98b559c24e2e">stp_sequence_set_float_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const float *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="group__sequence.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga16">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from float values.  <a href="group__sequence.html#g34a526cb5e72b611ac8a98b559c24e2e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd15e2cf350bb311da58f4b11240fa0f2">stp_sequence_set_long_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="group__sequence.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga17">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from long values.  <a href="group__sequence.html#gd15e2cf350bb311da58f4b11240fa0f2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gbc7ec322716d761436e4ad2d5d2f756f">stp_sequence_set_ulong_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const unsigned long *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="group__sequence.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga18">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned long values.  <a href="group__sequence.html#gbc7ec322716d761436e4ad2d5d2f756f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gd4f058b2c690ad4e326970cc841d8f79">stp_sequence_set_int_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="group__sequence.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga19">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from int values.  <a href="group__sequence.html#gd4f058b2c690ad4e326970cc841d8f79"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g40cd6256eb5bb72decd60edd1dc3be54">stp_sequence_set_uint_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const unsigned int *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="group__sequence.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga20">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned int values.  <a href="group__sequence.html#g40cd6256eb5bb72decd60edd1dc3be54"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ge0d6719f863a10422dea23e7f4b4dd29">stp_sequence_set_short_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="group__sequence.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga21">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from short values.  <a href="group__sequence.html#ge0d6719f863a10422dea23e7f4b4dd29"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g68aed44bbf6ede9ac49237091f2deb43">stp_sequence_set_ushort_data</a> (<a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t count, const unsigned short *data)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="group__sequence.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga22">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the data in a sequence from unsigned short values.  <a href="group__sequence.html#g68aed44bbf6ede9ac49237091f2deb43"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const float *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gf8cd9da688af479103cf8600e48f61c9">stp_sequence_get_float_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="group__sequence.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga23">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as float data.  <a href="group__sequence.html#gf8cd9da688af479103cf8600e48f61c9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g864b55caa3a8c0e573031a36f57f7cc4">stp_sequence_get_long_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="group__sequence.html#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga24">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as long data.  <a href="group__sequence.html#g864b55caa3a8c0e573031a36f57f7cc4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#gc4557b9fba98a7fbb4e17cc18fb0dded">stp_sequence_get_ulong_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="group__sequence.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga25">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned long data.  <a href="group__sequence.html#gc4557b9fba98a7fbb4e17cc18fb0dded"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g4396baf0d338eec6f3bce3e2000da978">stp_sequence_get_int_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="group__sequence.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga26">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as int data.  <a href="group__sequence.html#g4396baf0d338eec6f3bce3e2000da978"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g204f77e91c9283dc6ec6e742687bb0db">stp_sequence_get_uint_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="group__sequence.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga27">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned int data.  <a href="group__sequence.html#g204f77e91c9283dc6ec6e742687bb0db"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g91a68efd6b99150739c7706f65703a2f">stp_sequence_get_short_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="group__sequence.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#ga28">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as short data.  <a href="group__sequence.html#g91a68efd6b99150739c7706f65703a2f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__sequence.html#g8bf46faeea891ac7ca699591df596bc1">stp_sequence_get_ushort_data</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *sequence, size_t *count)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#ga28"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the data in a sequence as unsigned short data.  <a href="group__sequence.html#g8bf46faeea891ac7ca699591df596bc1"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Sequence functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/string-list_8h.html b/doc/gutenprint/html/string-list_8h.html
index 9285174..69c9620 100644
--- a/doc/gutenprint/html/string-list_8h.html
+++ b/doc/gutenprint/html/string-list_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/string-list.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>string-list.h File Reference</h1>String list functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -16,42 +30,42 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">String parameter.  <a href="structstp__param__string__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_string_list&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The string_list opaque data type.  <a href="#a0"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The string_list opaque data type.  <a href="#6ec7eafa9cb77e5c4c2502e19f1a3f5b"></a><br></td></tr>
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a1">stp_string_list_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#65077aa7201209fcaa58553d904fbc34">stp_string_list_create</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a2">stp_string_list_destroy</a> (<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#35638794468f0bb0dd7b912dac655bd5">stp_string_list_destroy</a> (<a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a3">stp_string_list_param</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, size_t element)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#997c38e27e8ad480118b84a6fdca4d79">stp_string_list_param</a> (const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list, size_t element)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a4">stp_string_list_find</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#25fd88ec425121519cc25d5279d29e6f">stp_string_list_find</a> (const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a5">stp_string_list_count</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#023eaab359b2f3c22d1a4fa7013e01ef">stp_string_list_count</a> (const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a6">stp_string_list_create_copy</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#e2f7a65ea28e02e39cc223898137127b">stp_string_list_create_copy</a> (const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a7">stp_string_list_add_string</a> (<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *name, const char *text)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#b9e6a3a7944ca10102b1a30a3acc6767">stp_string_list_add_string</a> (<a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list, const char *name, const char *text)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a8">stp_string_list_remove_string</a> (<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#26d7d318ddcbe976df1c91134d1ab262">stp_string_list_remove_string</a> (<a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a9">stp_string_list_create_from_params</a> (const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *list, size_t count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a4938d0cb58828f5d27086ae9c400857">stp_string_list_create_from_params</a> (const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *list, size_t count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#a10">stp_string_list_is_present</a> (const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *list, const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="string-list_8h.html#333d878e45062e5f3ef5cf63602f4ce3">stp_string_list_is_present</a> (const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *list, const char *value)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 String list functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="a0" args="" --><p>
+<a class="anchor" name="6ec7eafa9cb77e5c4c2502e19f1a3f5b"></a><!-- doxytag: member="string-list.h::stp_string_list_t" ref="6ec7eafa9cb77e5c4c2502e19f1a3f5b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef struct stp_string_list <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>          </td>
+          <td class="md" nowrap valign="top">typedef struct stp_string_list <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -71,7 +85,7 @@ The string_list opaque data type.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a7"></a><!-- doxytag: member="string-list.h::stp_string_list_add_string" ref="a7" args="(stp_string_list_t *list, const char *name, const char *text)" --><p>
+<a class="anchor" name="b9e6a3a7944ca10102b1a30a3acc6767"></a><!-- doxytag: member="string-list.h::stp_string_list_add_string" ref="b9e6a3a7944ca10102b1a30a3acc6767" args="(stp_string_list_t *list, const char *name, const char *text)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -79,7 +93,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top">void stp_string_list_add_string           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -114,7 +128,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="string-list.h::stp_string_list_count" ref="a5" args="(const stp_string_list_t *list)" --><p>
+<a class="anchor" name="023eaab359b2f3c22d1a4fa7013e01ef"></a><!-- doxytag: member="string-list.h::stp_string_list_count" ref="023eaab359b2f3c22d1a4fa7013e01ef" args="(const stp_string_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -122,7 +136,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top">size_t stp_string_list_count           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -142,13 +156,13 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="string-list.h::stp_string_list_create" ref="a1" args="(void)" --><p>
+<a class="anchor" name="65077aa7201209fcaa58553d904fbc34"></a><!-- doxytag: member="string-list.h::stp_string_list_create" ref="65077aa7201209fcaa58553d904fbc34" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* stp_string_list_create           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>* stp_string_list_create           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -170,15 +184,15 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="string-list.h::stp_string_list_create_copy" ref="a6" args="(const stp_string_list_t *list)" --><p>
+<a class="anchor" name="e2f7a65ea28e02e39cc223898137127b"></a><!-- doxytag: member="string-list.h::stp_string_list_create_copy" ref="e2f7a65ea28e02e39cc223898137127b" args="(const stp_string_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* stp_string_list_create_copy           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>* stp_string_list_create_copy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -198,13 +212,13 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="string-list.h::stp_string_list_create_from_params" ref="a9" args="(const stp_param_string_t *list, size_t count)" --><p>
+<a class="anchor" name="a4938d0cb58828f5d27086ae9c400857"></a><!-- doxytag: member="string-list.h::stp_string_list_create_from_params" ref="a4938d0cb58828f5d27086ae9c400857" args="(const stp_param_string_t *list, size_t count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* stp_string_list_create_from_params           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>* stp_string_list_create_from_params           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__param__string__t.html">stp_param_string_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
@@ -235,7 +249,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="string-list.h::stp_string_list_destroy" ref="a2" args="(stp_string_list_t *list)" --><p>
+<a class="anchor" name="35638794468f0bb0dd7b912dac655bd5"></a><!-- doxytag: member="string-list.h::stp_string_list_destroy" ref="35638794468f0bb0dd7b912dac655bd5" args="(stp_string_list_t *list)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -243,7 +257,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top">void stp_string_list_destroy           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>list</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -263,7 +277,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="string-list.h::stp_string_list_find" ref="a4" args="(const stp_string_list_t *list, const char *name)" --><p>
+<a class="anchor" name="25fd88ec425121519cc25d5279d29e6f"></a><!-- doxytag: member="string-list.h::stp_string_list_find" ref="25fd88ec425121519cc25d5279d29e6f" args="(const stp_string_list_t *list, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -271,7 +285,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>* stp_string_list_find           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -300,7 +314,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="string-list.h::stp_string_list_is_present" ref="a10" args="(const stp_string_list_t *list, const char *value)" --><p>
+<a class="anchor" name="333d878e45062e5f3ef5cf63602f4ce3"></a><!-- doxytag: member="string-list.h::stp_string_list_is_present" ref="333d878e45062e5f3ef5cf63602f4ce3" args="(const stp_string_list_t *list, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -308,7 +322,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top">int stp_string_list_is_present           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -337,7 +351,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="string-list.h::stp_string_list_param" ref="a3" args="(const stp_string_list_t *list, size_t element)" --><p>
+<a class="anchor" name="997c38e27e8ad480118b84a6fdca4d79"></a><!-- doxytag: member="string-list.h::stp_string_list_param" ref="997c38e27e8ad480118b84a6fdca4d79" args="(const stp_string_list_t *list, size_t element)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -345,7 +359,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__param__string__t.html">stp_param_string_t</a>* stp_string_list_param           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -374,7 +388,7 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="string-list.h::stp_string_list_remove_string" ref="a8" args="(stp_string_list_t *list, const char *name)" --><p>
+<a class="anchor" name="26d7d318ddcbe976df1c91134d1ab262"></a><!-- doxytag: member="string-list.h::stp_string_list_remove_string" ref="26d7d318ddcbe976df1c91134d1ab262" args="(stp_string_list_t *list, const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -382,7 +396,7 @@ The string_list opaque data type.
         <tr>
           <td class="md" nowrap valign="top">void stp_string_list_remove_string           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>list</em>, </td>
         </tr>
         <tr>
@@ -411,8 +425,8 @@ The string_list opaque data type.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:02 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structdither__matrix__impl.html b/doc/gutenprint/html/structdither__matrix__impl.html
index e9ba343..90c736e 100644
--- a/doc/gutenprint/html/structdither__matrix__impl.html
+++ b/doc/gutenprint/html/structdither__matrix__impl.html
@@ -2,53 +2,68 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: dither_matrix_impl Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>dither_matrix_impl Struct Reference</h1><!-- doxytag: class="dither_matrix_impl" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o0">base</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#593616de15330c0fb2d55e55410bf994">base</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o1">exp</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#b0ab0254bd58eb87eaee3172ba49fefb">exp</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o2">x_size</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#f0ed41c0ec21ebf3f06c1a1ec9d04456">x_size</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o3">y_size</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#6f8a30ff8882b910eb6092965bff1166">y_size</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o4">total_size</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#2cd6b347ff013dd494370a9938344885">total_size</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o5">last_x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#94f66fddf2c8dd22340220c82f6115fd">last_x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o6">last_x_mod</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#f1cbd20a4cb7668e3b450ae3c7879fb2">last_x_mod</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o7">last_y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#dcf093deead926d5e89cdf4cf72068cf">last_y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o8">last_y_mod</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#ea9a91cee135cee3ba2750f2875cf610">last_y_mod</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o9">index</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#6a992d5529f459a44fee58c733255e86">index</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o10">i_own</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#618931f210c709ac7c0a44ed090aef93">i_own</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o11">x_offset</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#80997876f6afba983eaec918e58ecc0d">x_offset</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o12">y_offset</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#6055652d6d84e1c46e19438c923113ff">y_offset</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o13">fast_mask</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#31acd511b5ec97637395c849e2089e00">fast_mask</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#o14">matrix</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structdither__matrix__impl.html#21b72c0b7adc5c7b4a50ffcb90d92dd6">matrix</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="dither_matrix_impl::base" ref="o0" args="" --><p>
+<a class="anchor" name="593616de15330c0fb2d55e55410bf994"></a><!-- doxytag: member="dither_matrix_impl::base" ref="593616de15330c0fb2d55e55410bf994" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o0">dither_matrix_impl::base</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#593616de15330c0fb2d55e55410bf994">dither_matrix_impl::base</a>          </td>
         </tr>
       </table>
     </td>
@@ -65,13 +80,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="o1" args="" --><p>
+<a class="anchor" name="b0ab0254bd58eb87eaee3172ba49fefb"></a><!-- doxytag: member="dither_matrix_impl::exp" ref="b0ab0254bd58eb87eaee3172ba49fefb" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o1">dither_matrix_impl::exp</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#b0ab0254bd58eb87eaee3172ba49fefb">dither_matrix_impl::exp</a>          </td>
         </tr>
       </table>
     </td>
@@ -88,13 +103,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o13"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="o13" args="" --><p>
+<a class="anchor" name="31acd511b5ec97637395c849e2089e00"></a><!-- doxytag: member="dither_matrix_impl::fast_mask" ref="31acd511b5ec97637395c849e2089e00" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structdither__matrix__impl.html#o13">dither_matrix_impl::fast_mask</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structdither__matrix__impl.html#31acd511b5ec97637395c849e2089e00">dither_matrix_impl::fast_mask</a>          </td>
         </tr>
       </table>
     </td>
@@ -111,13 +126,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="o10" args="" --><p>
+<a class="anchor" name="618931f210c709ac7c0a44ed090aef93"></a><!-- doxytag: member="dither_matrix_impl::i_own" ref="618931f210c709ac7c0a44ed090aef93" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o10">dither_matrix_impl::i_own</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#618931f210c709ac7c0a44ed090aef93">dither_matrix_impl::i_own</a>          </td>
         </tr>
       </table>
     </td>
@@ -134,13 +149,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="dither_matrix_impl::index" ref="o9" args="" --><p>
+<a class="anchor" name="6a992d5529f459a44fee58c733255e86"></a><!-- doxytag: member="dither_matrix_impl::index" ref="6a992d5529f459a44fee58c733255e86" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o9">dither_matrix_impl::index</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#6a992d5529f459a44fee58c733255e86">dither_matrix_impl::index</a>          </td>
         </tr>
       </table>
     </td>
@@ -157,13 +172,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="o5" args="" --><p>
+<a class="anchor" name="94f66fddf2c8dd22340220c82f6115fd"></a><!-- doxytag: member="dither_matrix_impl::last_x" ref="94f66fddf2c8dd22340220c82f6115fd" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o5">dither_matrix_impl::last_x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#94f66fddf2c8dd22340220c82f6115fd">dither_matrix_impl::last_x</a>          </td>
         </tr>
       </table>
     </td>
@@ -180,13 +195,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="o6" args="" --><p>
+<a class="anchor" name="f1cbd20a4cb7668e3b450ae3c7879fb2"></a><!-- doxytag: member="dither_matrix_impl::last_x_mod" ref="f1cbd20a4cb7668e3b450ae3c7879fb2" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o6">dither_matrix_impl::last_x_mod</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#f1cbd20a4cb7668e3b450ae3c7879fb2">dither_matrix_impl::last_x_mod</a>          </td>
         </tr>
       </table>
     </td>
@@ -203,13 +218,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="o7" args="" --><p>
+<a class="anchor" name="dcf093deead926d5e89cdf4cf72068cf"></a><!-- doxytag: member="dither_matrix_impl::last_y" ref="dcf093deead926d5e89cdf4cf72068cf" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o7">dither_matrix_impl::last_y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#dcf093deead926d5e89cdf4cf72068cf">dither_matrix_impl::last_y</a>          </td>
         </tr>
       </table>
     </td>
@@ -226,13 +241,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="o8" args="" --><p>
+<a class="anchor" name="ea9a91cee135cee3ba2750f2875cf610"></a><!-- doxytag: member="dither_matrix_impl::last_y_mod" ref="ea9a91cee135cee3ba2750f2875cf610" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o8">dither_matrix_impl::last_y_mod</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#ea9a91cee135cee3ba2750f2875cf610">dither_matrix_impl::last_y_mod</a>          </td>
         </tr>
       </table>
     </td>
@@ -249,13 +264,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o14"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="o14" args="" --><p>
+<a class="anchor" name="21b72c0b7adc5c7b4a50ffcb90d92dd6"></a><!-- doxytag: member="dither_matrix_impl::matrix" ref="21b72c0b7adc5c7b4a50ffcb90d92dd6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned* <a class="el" href="structdither__matrix__impl.html#o14">dither_matrix_impl::matrix</a>          </td>
+          <td class="md" nowrap valign="top">unsigned* <a class="el" href="structdither__matrix__impl.html#21b72c0b7adc5c7b4a50ffcb90d92dd6">dither_matrix_impl::matrix</a>          </td>
         </tr>
       </table>
     </td>
@@ -272,13 +287,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="o4" args="" --><p>
+<a class="anchor" name="2cd6b347ff013dd494370a9938344885"></a><!-- doxytag: member="dither_matrix_impl::total_size" ref="2cd6b347ff013dd494370a9938344885" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o4">dither_matrix_impl::total_size</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#2cd6b347ff013dd494370a9938344885">dither_matrix_impl::total_size</a>          </td>
         </tr>
       </table>
     </td>
@@ -295,13 +310,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="o11" args="" --><p>
+<a class="anchor" name="80997876f6afba983eaec918e58ecc0d"></a><!-- doxytag: member="dither_matrix_impl::x_offset" ref="80997876f6afba983eaec918e58ecc0d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o11">dither_matrix_impl::x_offset</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#80997876f6afba983eaec918e58ecc0d">dither_matrix_impl::x_offset</a>          </td>
         </tr>
       </table>
     </td>
@@ -318,13 +333,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="o2" args="" --><p>
+<a class="anchor" name="f0ed41c0ec21ebf3f06c1a1ec9d04456"></a><!-- doxytag: member="dither_matrix_impl::x_size" ref="f0ed41c0ec21ebf3f06c1a1ec9d04456" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o2">dither_matrix_impl::x_size</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#f0ed41c0ec21ebf3f06c1a1ec9d04456">dither_matrix_impl::x_size</a>          </td>
         </tr>
       </table>
     </td>
@@ -341,13 +356,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="o12" args="" --><p>
+<a class="anchor" name="6055652d6d84e1c46e19438c923113ff"></a><!-- doxytag: member="dither_matrix_impl::y_offset" ref="6055652d6d84e1c46e19438c923113ff" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o12">dither_matrix_impl::y_offset</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#6055652d6d84e1c46e19438c923113ff">dither_matrix_impl::y_offset</a>          </td>
         </tr>
       </table>
     </td>
@@ -364,13 +379,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="o3" args="" --><p>
+<a class="anchor" name="6f8a30ff8882b910eb6092965bff1166"></a><!-- doxytag: member="dither_matrix_impl::y_size" ref="6f8a30ff8882b910eb6092965bff1166" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#o3">dither_matrix_impl::y_size</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structdither__matrix__impl.html#6f8a30ff8882b910eb6092965bff1166">dither_matrix_impl::y_size</a>          </td>
         </tr>
       </table>
     </td>
@@ -389,8 +404,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__cached__curve__t.html b/doc/gutenprint/html/structstp__cached__curve__t.html
index 5fdde11..af05a28 100644
--- a/doc/gutenprint/html/structstp__cached__curve__t.html
+++ b/doc/gutenprint/html/structstp__cached__curve__t.html
@@ -2,31 +2,46 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_cached_curve_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_cached_curve_t Struct Reference</h1><!-- doxytag: class="stp_cached_curve_t" --><code>#include &lt;curve-cache.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o0">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#4efa264f5ef3e1a5c95736e07544ebf0">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o1">d_cache</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const double *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#f7e3e9aa11a7dd4199647af2e87a3bab">d_cache</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o2">s_cache</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#9c9886e8af38f75727d2b354afa8f218">s_cache</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#o3">count</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__cached__curve__t.html#e2942a04780e223b215eb8b663cf5353">count</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="o3" args="" --><p>
+<a class="anchor" name="e2942a04780e223b215eb8b663cf5353"></a><!-- doxytag: member="stp_cached_curve_t::count" ref="e2942a04780e223b215eb8b663cf5353" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">size_t <a class="el" href="structstp__cached__curve__t.html#o3">stp_cached_curve_t::count</a>          </td>
+          <td class="md" nowrap valign="top">size_t <a class="el" href="structstp__cached__curve__t.html#e2942a04780e223b215eb8b663cf5353">stp_cached_curve_t::count</a>          </td>
         </tr>
       </table>
     </td>
@@ -43,13 +58,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="o0" args="" --><p>
+<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="stp_cached_curve_t::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* <a class="el" href="structstp__cached__curve__t.html#o0">stp_cached_curve_t::curve</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* <a class="el" href="structstp__cached__curve__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_cached_curve_t::curve</a>          </td>
         </tr>
       </table>
     </td>
@@ -66,13 +81,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="o1" args="" --><p>
+<a class="anchor" name="f7e3e9aa11a7dd4199647af2e87a3bab"></a><!-- doxytag: member="stp_cached_curve_t::d_cache" ref="f7e3e9aa11a7dd4199647af2e87a3bab" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const double* <a class="el" href="structstp__cached__curve__t.html#o1">stp_cached_curve_t::d_cache</a>          </td>
+          <td class="md" nowrap valign="top">const double* <a class="el" href="structstp__cached__curve__t.html#f7e3e9aa11a7dd4199647af2e87a3bab">stp_cached_curve_t::d_cache</a>          </td>
         </tr>
       </table>
     </td>
@@ -89,13 +104,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="o2" args="" --><p>
+<a class="anchor" name="9c9886e8af38f75727d2b354afa8f218"></a><!-- doxytag: member="stp_cached_curve_t::s_cache" ref="9c9886e8af38f75727d2b354afa8f218" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* <a class="el" href="structstp__cached__curve__t.html#o2">stp_cached_curve_t::s_cache</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned short* <a class="el" href="structstp__cached__curve__t.html#9c9886e8af38f75727d2b354afa8f218">stp_cached_curve_t::s_cache</a>          </td>
         </tr>
       </table>
     </td>
@@ -114,8 +129,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve-cache_8h.html">curve-cache.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__color.html b/doc/gutenprint/html/structstp__color.html
index dc94b2c..1b8d608 100644
--- a/doc/gutenprint/html/structstp__color.html
+++ b/doc/gutenprint/html/structstp__color.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_color Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_color Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -13,21 +28,67 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#o0">short_name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#4698bac7fdbf14511adbe13aeefe80b8">short_name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga3">long_name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#2fc6351aa4209f68fb16e85c6104f96c">long_name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga4">colorfuncs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__color.html#a3f019e45920da0adf4ce2eec4cc2e7c">colorfuncs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_color::short_name" ref="o0" args="" --><p>
+<a class="anchor" name="a3f019e45920da0adf4ce2eec4cc2e7c"></a><!-- doxytag: member="stp_color::colorfuncs" ref="a3f019e45920da0adf4ce2eec4cc2e7c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#o0">stp_color::short_name</a>          </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="structstp__colorfuncs__t.html">stp_colorfuncs_t</a>* <a class="el" href="structstp__color.html#a3f019e45920da0adf4ce2eec4cc2e7c">stp_color::colorfuncs</a>          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="2fc6351aa4209f68fb16e85c6104f96c"></a><!-- doxytag: member="stp_color::long_name" ref="2fc6351aa4209f68fb16e85c6104f96c" args="" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#2fc6351aa4209f68fb16e85c6104f96c">stp_color::long_name</a>          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="4698bac7fdbf14511adbe13aeefe80b8"></a><!-- doxytag: member="stp_color::short_name" ref="4698bac7fdbf14511adbe13aeefe80b8" args="" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__color.html#4698bac7fdbf14511adbe13aeefe80b8">stp_color::short_name</a>          </td>
         </tr>
       </table>
     </td>
@@ -46,8 +107,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__colorfuncs__t.html b/doc/gutenprint/html/structstp__colorfuncs__t.html
index b35b3db..e5582f0 100644
--- a/doc/gutenprint/html/structstp__colorfuncs__t.html
+++ b/doc/gutenprint/html/structstp__colorfuncs__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_colorfuncs_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_colorfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__color.html">color</a>]</small>
@@ -13,23 +28,92 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#o0">init</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#5aafc0d83b487b1d0a8db5c1f1cd227d">init</a> )(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga0">get_row</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#1130ff4ca5f70a5f951b69fa41ef8016">get_row</a> )(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga1">list_parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">list_parameters</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__color.html#ga2">describe_parameter</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__colorfuncs__t.html#358435dd7c4c3dba226ba7016dba0cad">describe_parameter</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_colorfuncs_t::init" ref="o0" args=")(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
+<a class="anchor" name="358435dd7c4c3dba226ba7016dba0cad"></a><!-- doxytag: member="stp_colorfuncs_t::describe_parameter" ref="358435dd7c4c3dba226ba7016dba0cad" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *description)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__colorfuncs__t.html#o0">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__colorfuncs__t.html#358435dd7c4c3dba226ba7016dba0cad">stp_colorfuncs_t::describe_parameter</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="1130ff4ca5f70a5f951b69fa41ef8016"></a><!-- doxytag: member="stp_colorfuncs_t::get_row" ref="1130ff4ca5f70a5f951b69fa41ef8016" args=")(stp_vars_t *v, stp_image_t *image, int row, unsigned *zero_mask)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__colorfuncs__t.html#1130ff4ca5f70a5f951b69fa41ef8016">stp_colorfuncs_t::get_row</a>)(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, int row, unsigned *zero_mask)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="5aafc0d83b487b1d0a8db5c1f1cd227d"></a><!-- doxytag: member="stp_colorfuncs_t::init" ref="5aafc0d83b487b1d0a8db5c1f1cd227d" args=")(stp_vars_t *v, stp_image_t *image, size_t steps)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__colorfuncs__t.html#5aafc0d83b487b1d0a8db5c1f1cd227d">stp_colorfuncs_t::init</a>)(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image, size_t steps)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="54879ee9c7f05b72f24bab4bce932970"></a><!-- doxytag: member="stp_colorfuncs_t::list_parameters" ref="54879ee9c7f05b72f24bab4bce932970" args=")(const stp_vars_t *v)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>(* <a class="el" href="structstp__colorfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">stp_colorfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -48,8 +132,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="color_8h.html">color.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__curve__point__t.html b/doc/gutenprint/html/structstp__curve__point__t.html
index f3d54ad..5b950ee 100644
--- a/doc/gutenprint/html/structstp__curve__point__t.html
+++ b/doc/gutenprint/html/structstp__curve__point__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_curve_point_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_curve_point_t Struct Reference<br>
 <small>
 [<a class="el" href="group__curve.html">curve</a>]</small>
@@ -16,24 +31,24 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#9dd4e461268c8034f5c8564e155c67a6">x</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Horizontal position.  <a href="#o0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#o1">y</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Horizontal position.  <a href="#9dd4e461268c8034f5c8564e155c67a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__curve__point__t.html#415290769594460e2e485922904f345d">y</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Vertical position.  <a href="#o1"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Vertical position.  <a href="#415290769594460e2e485922904f345d"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Point (x,y) for piecewise curve. 
 <p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_curve_point_t::x" ref="o0" args="" --><p>
+<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_curve_point_t::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#o0">stp_curve_point_t::x</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#9dd4e461268c8034f5c8564e155c67a6">stp_curve_point_t::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -52,13 +67,13 @@ Horizontal position.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_curve_point_t::y" ref="o1" args="" --><p>
+<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_curve_point_t::y" ref="415290769594460e2e485922904f345d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#o1">stp_curve_point_t::y</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__curve__point__t.html#415290769594460e2e485922904f345d">stp_curve_point_t::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -79,8 +94,8 @@ Vertical position.
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__generic.html b/doc/gutenprint/html/structstp__dither__matrix__generic.html
index 80e9519..419065f 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__generic.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__generic.html
@@ -2,33 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_dither_matrix_generic Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_dither_matrix_generic Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_generic" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#9dd4e461268c8034f5c8564e155c67a6">x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o1">y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#415290769594460e2e485922904f345d">y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o2">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#4b3a6218bb3e3a7303e8a171a60fcf92">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o3">prescaled</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#aa3d9d64037ca4cdd2a4d871d673bd73">prescaled</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#o4">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__generic.html#8d777f385d3dfec8815d20f7496026dc">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="o2" args="" --><p>
+<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_dither_matrix_generic::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o2">stp_dither_matrix_generic::bytes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_generic::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -45,13 +60,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="o4" args="" --><p>
+<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_dither_matrix_generic::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const void* <a class="el" href="structstp__dither__matrix__generic.html#o4">stp_dither_matrix_generic::data</a>          </td>
+          <td class="md" nowrap valign="top">const void* <a class="el" href="structstp__dither__matrix__generic.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_generic::data</a>          </td>
         </tr>
       </table>
     </td>
@@ -68,13 +83,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="o3" args="" --><p>
+<a class="anchor" name="aa3d9d64037ca4cdd2a4d871d673bd73"></a><!-- doxytag: member="stp_dither_matrix_generic::prescaled" ref="aa3d9d64037ca4cdd2a4d871d673bd73" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o3">stp_dither_matrix_generic::prescaled</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_generic::prescaled</a>          </td>
         </tr>
       </table>
     </td>
@@ -91,13 +106,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="o0" args="" --><p>
+<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_dither_matrix_generic::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o0">stp_dither_matrix_generic::x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_generic::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -114,13 +129,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="o1" args="" --><p>
+<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_dither_matrix_generic::y" ref="415290769594460e2e485922904f345d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#o1">stp_dither_matrix_generic::y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__generic.html#415290769594460e2e485922904f345d">stp_dither_matrix_generic::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -139,8 +154,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__normal.html b/doc/gutenprint/html/structstp__dither__matrix__normal.html
index 4e4a567..070c3fc 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__normal.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__normal.html
@@ -2,33 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_dither_matrix_normal Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_dither_matrix_normal Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_normal" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#9dd4e461268c8034f5c8564e155c67a6">x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o1">y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#415290769594460e2e485922904f345d">y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o2">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#4b3a6218bb3e3a7303e8a171a60fcf92">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o3">prescaled</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#aa3d9d64037ca4cdd2a4d871d673bd73">prescaled</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#o4">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__normal.html#8d777f385d3dfec8815d20f7496026dc">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="o2" args="" --><p>
+<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_dither_matrix_normal::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o2">stp_dither_matrix_normal::bytes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_normal::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -45,13 +60,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="o4" args="" --><p>
+<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_dither_matrix_normal::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#o4">stp_dither_matrix_normal::data</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned* <a class="el" href="structstp__dither__matrix__normal.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_normal::data</a>          </td>
         </tr>
       </table>
     </td>
@@ -68,13 +83,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="o3" args="" --><p>
+<a class="anchor" name="aa3d9d64037ca4cdd2a4d871d673bd73"></a><!-- doxytag: member="stp_dither_matrix_normal::prescaled" ref="aa3d9d64037ca4cdd2a4d871d673bd73" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o3">stp_dither_matrix_normal::prescaled</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_normal::prescaled</a>          </td>
         </tr>
       </table>
     </td>
@@ -91,13 +106,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="o0" args="" --><p>
+<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_dither_matrix_normal::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o0">stp_dither_matrix_normal::x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_normal::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -114,13 +129,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="o1" args="" --><p>
+<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_dither_matrix_normal::y" ref="415290769594460e2e485922904f345d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#o1">stp_dither_matrix_normal::y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__normal.html#415290769594460e2e485922904f345d">stp_dither_matrix_normal::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -139,8 +154,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dither__matrix__short.html b/doc/gutenprint/html/structstp__dither__matrix__short.html
index 8b02c9a..aeef647 100644
--- a/doc/gutenprint/html/structstp__dither__matrix__short.html
+++ b/doc/gutenprint/html/structstp__dither__matrix__short.html
@@ -2,33 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_dither_matrix_short Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_dither_matrix_short Struct Reference</h1><!-- doxytag: class="stp_dither_matrix_short" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o0">x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#9dd4e461268c8034f5c8564e155c67a6">x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o1">y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#415290769594460e2e485922904f345d">y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o2">bytes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#4b3a6218bb3e3a7303e8a171a60fcf92">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o3">prescaled</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#aa3d9d64037ca4cdd2a4d871d673bd73">prescaled</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#o4">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const unsigned short *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dither__matrix__short.html#8d777f385d3dfec8815d20f7496026dc">data</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="o2" args="" --><p>
+<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_dither_matrix_short::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o2">stp_dither_matrix_short::bytes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_dither_matrix_short::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -45,13 +60,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="o4" args="" --><p>
+<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_dither_matrix_short::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#o4">stp_dither_matrix_short::data</a>          </td>
+          <td class="md" nowrap valign="top">const unsigned short* <a class="el" href="structstp__dither__matrix__short.html#8d777f385d3dfec8815d20f7496026dc">stp_dither_matrix_short::data</a>          </td>
         </tr>
       </table>
     </td>
@@ -68,13 +83,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="o3" args="" --><p>
+<a class="anchor" name="aa3d9d64037ca4cdd2a4d871d673bd73"></a><!-- doxytag: member="stp_dither_matrix_short::prescaled" ref="aa3d9d64037ca4cdd2a4d871d673bd73" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o3">stp_dither_matrix_short::prescaled</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#aa3d9d64037ca4cdd2a4d871d673bd73">stp_dither_matrix_short::prescaled</a>          </td>
         </tr>
       </table>
     </td>
@@ -91,13 +106,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="o0" args="" --><p>
+<a class="anchor" name="9dd4e461268c8034f5c8564e155c67a6"></a><!-- doxytag: member="stp_dither_matrix_short::x" ref="9dd4e461268c8034f5c8564e155c67a6" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o0">stp_dither_matrix_short::x</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#9dd4e461268c8034f5c8564e155c67a6">stp_dither_matrix_short::x</a>          </td>
         </tr>
       </table>
     </td>
@@ -114,13 +129,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="o1" args="" --><p>
+<a class="anchor" name="415290769594460e2e485922904f345d"></a><!-- doxytag: member="stp_dither_matrix_short::y" ref="415290769594460e2e485922904f345d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#o1">stp_dither_matrix_short::y</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__dither__matrix__short.html#415290769594460e2e485922904f345d">stp_dither_matrix_short::y</a>          </td>
         </tr>
       </table>
     </td>
@@ -139,8 +154,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__dotsize.html b/doc/gutenprint/html/structstp__dotsize.html
index 8f9788c..da485d3 100644
--- a/doc/gutenprint/html/structstp__dotsize.html
+++ b/doc/gutenprint/html/structstp__dotsize.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_dotsize Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_dotsize Struct Reference</h1><!-- doxytag: class="stp_dotsize" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#o0">bit_pattern</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#67b7bfbc0ce2bbedbf5837e91f8773cd">bit_pattern</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#o1">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__dotsize.html#2063c1608d6e0baf80249c42e2be5804">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="o0" args="" --><p>
+<a class="anchor" name="67b7bfbc0ce2bbedbf5837e91f8773cd"></a><!-- doxytag: member="stp_dotsize::bit_pattern" ref="67b7bfbc0ce2bbedbf5837e91f8773cd" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__dotsize.html#o0">stp_dotsize::bit_pattern</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__dotsize.html#67b7bfbc0ce2bbedbf5837e91f8773cd">stp_dotsize::bit_pattern</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_dotsize::value" ref="o1" args="" --><p>
+<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_dotsize::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__dotsize.html#o1">stp_dotsize::value</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__dotsize.html#2063c1608d6e0baf80249c42e2be5804">stp_dotsize::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__double__bound__t.html b/doc/gutenprint/html/structstp__double__bound__t.html
index f9f8a62..b9115bd 100644
--- a/doc/gutenprint/html/structstp__double__bound__t.html
+++ b/doc/gutenprint/html/structstp__double__bound__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_double_bound_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_double_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -15,23 +30,23 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#o0">lower</a></td></tr>
+<tr><td colspan="2"><br><h2>Public Types</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#81e073b428b50247daba38531dcf412a">lower</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#o1">upper</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__double__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">upper</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 double_bound (range) parameter. 
 <p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="o0" args="" --><p>
+<hr><h2>Member Typedef Documentation</h2>
+<a class="anchor" name="81e073b428b50247daba38531dcf412a"></a><!-- doxytag: member="stp_double_bound_t::lower" ref="81e073b428b50247daba38531dcf412a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__double__bound__t.html#o0">stp_double_bound_t::lower</a>          </td>
+          <td class="md" nowrap valign="top">typedef double <a class="el" href="structstp__double__bound__t.html#81e073b428b50247daba38531dcf412a">stp_double_bound_t::lower</a>          </td>
         </tr>
       </table>
     </td>
@@ -48,13 +63,13 @@ double_bound (range) parameter.
 Lower bound.     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="o1" args="" --><p>
+<a class="anchor" name="0122b4c2c01ee1c698ecc309d2b8eb5a"></a><!-- doxytag: member="stp_double_bound_t::upper" ref="0122b4c2c01ee1c698ecc309d2b8eb5a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__double__bound__t.html#o1">stp_double_bound_t::upper</a>          </td>
+          <td class="md" nowrap valign="top">typedef double <a class="el" href="structstp__double__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_double_bound_t::upper</a>          </td>
         </tr>
       </table>
     </td>
@@ -73,8 +88,8 @@ Upper bound.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__family.html b/doc/gutenprint/html/structstp__family.html
index e03cdf0..d16bdb9 100644
--- a/doc/gutenprint/html/structstp__family.html
+++ b/doc/gutenprint/html/structstp__family.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_family Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_family Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -13,19 +28,19 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#o0">printfuncs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#c0c2f50561daa16ae61c455b0861718a">printfuncs</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#o1">printer_list</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__family.html#505045dc6abce739a39cbc650ad05535">printer_list</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_family::printer_list" ref="o1" args="" --><p>
+<a class="anchor" name="505045dc6abce739a39cbc650ad05535"></a><!-- doxytag: member="stp_family::printer_list" ref="505045dc6abce739a39cbc650ad05535" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#ga1">stp_list_t</a>* <a class="el" href="structstp__family.html#o1">stp_family::printer_list</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__list.html#g01be7c3ea8c46226978010d453016f22">stp_list_t</a>* <a class="el" href="structstp__family.html#505045dc6abce739a39cbc650ad05535">stp_family::printer_list</a>          </td>
         </tr>
       </table>
     </td>
@@ -42,13 +57,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_family::printfuncs" ref="o0" args="" --><p>
+<a class="anchor" name="c0c2f50561daa16ae61c455b0861718a"></a><!-- doxytag: member="stp_family::printfuncs" ref="c0c2f50561daa16ae61c455b0861718a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family.html#o0">stp_family::printfuncs</a>          </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="structstp__printfuncs__t.html">stp_printfuncs_t</a>* <a class="el" href="structstp__family.html#c0c2f50561daa16ae61c455b0861718a">stp_family::printfuncs</a>          </td>
         </tr>
       </table>
     </td>
@@ -67,8 +82,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__image.html b/doc/gutenprint/html/structstp__image.html
index 8933ca7..3e90ed5 100644
--- a/doc/gutenprint/html/structstp__image.html
+++ b/doc/gutenprint/html/structstp__image.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_image Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_image Struct Reference<br>
 <small>
 [<a class="el" href="group__image.html">image</a>]</small>
@@ -16,44 +31,157 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#o0">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#9aebe24f43e2fe0d4342495a64026baa">init</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#o0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga0">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is used to perform any initialization required by the image layer for the image.  <a href="#9aebe24f43e2fe0d4342495a64026baa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#edae63ed1524916fdef45cb652d7275e">reset</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="group__image.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga1">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called to reset the image to the beginning.  <a href="#edae63ed1524916fdef45cb652d7275e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#85ce2739e10b7c073f108a82b3e5d717">width</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="group__image.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga2">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the width of the image in pixels.  <a href="#85ce2739e10b7c073f108a82b3e5d717"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#36cffb4418960b12743fc547902e35a6">height</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="group__image.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#ga17">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga3">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the height of the image in pixels.  <a href="#36cffb4418960b12743fc547902e35a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#e2681945ea918b7082ba78751d084347">get_row</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="group__image.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga4">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback transfers the data from the image to the gimp-print library.  <a href="#e2681945ea918b7082ba78751d084347"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#e9495dba1df955709ebbd651c1a526e6">get_appname</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="group__image.html#ga4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga5">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback returns the name of the application.  <a href="#e9495dba1df955709ebbd651c1a526e6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#6af9f0bf8a602f4a937c6e207a03ec01">conclude</a> )(struct <a class="el" href="structstp__image.html">stp_image</a> *image)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="group__image.html#ga5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__image.html#ga6">rep</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">This callback is called at the end of each page.  <a href="#6af9f0bf8a602f4a937c6e207a03ec01"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__image.html#75a384057459ae8e69fb9a98a249b4f4">rep</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="group__image.html#ga6"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">A pointer to an application-specific state information that might need to be associated with the image object.  <a href="#75a384057459ae8e69fb9a98a249b4f4"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The image type is an abstract data type for interfacing with the image creation program. 
 <p>
-It provides callbacks to functions defined within the client application which are called while printing the image.
+It provides callbacks to functions defined within the client application which are called while printing the image. 
 <p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_image::init" ref="o0" args=")(struct stp_image *image)" --><p>
+<a class="anchor" name="6af9f0bf8a602f4a937c6e207a03ec01"></a><!-- doxytag: member="stp_image::conclude" ref="6af9f0bf8a602f4a937c6e207a03ec01" args=")(struct stp_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#o0">stp_image::init</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#6af9f0bf8a602f4a937c6e207a03ec01">stp_image::conclude</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+This callback is called at the end of each page. 
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="e9495dba1df955709ebbd651c1a526e6"></a><!-- doxytag: member="stp_image::get_appname" ref="e9495dba1df955709ebbd651c1a526e6" args=")(struct stp_image *image)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__image.html#e9495dba1df955709ebbd651c1a526e6">stp_image::get_appname</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+This callback returns the name of the application. 
+<p>
+This is embedded in the output by some drivers.     </td>
+  </tr>
+</table>
+<a class="anchor" name="e2681945ea918b7082ba78751d084347"></a><!-- doxytag: member="stp_image::get_row" ref="e2681945ea918b7082ba78751d084347" args=")(struct stp_image *image, unsigned char *data, size_t byte_limit, int row)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top"><a class="el" href="group__image.html#g3378dd231cc63da06de0bb41f1cde78f">stp_image_status_t</a>(* <a class="el" href="structstp__image.html#e2681945ea918b7082ba78751d084347">stp_image::get_row</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image, unsigned char *data, size_t byte_limit, int row)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+This callback transfers the data from the image to the gimp-print library. 
+<p>
+It is called from the driver layer. It should copy WIDTH (as returned by the <a class="el" href="structstp__image.html#85ce2739e10b7c073f108a82b3e5d717">width()</a> member) pixels of data into the data buffer. It normally returns STP_IMAGE_STATUS_OK; if something goes wrong, or the application wishes to stop producing any further output (e. g. because the user cancelled the print job), it should return STP_IMAGE_STATUS_ABORT. This will cause the driver to flush any remaining data to the output. It will always request rows in monotonically ascending order, but it may skip rows (if, for example, the resolution of the input is higher than the resolution of the output). <dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>data</em>&nbsp;</td><td>a pointer to <a class="el" href="structstp__image.html#85ce2739e10b7c073f108a82b3e5d717">width()</a> bytes of pixel data. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>byte_limit</em>&nbsp;</td><td>(image width * number of channels). </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>row</em>&nbsp;</td><td>(unused). </td></tr>
+  </table>
+</dl>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="36cffb4418960b12743fc547902e35a6"></a><!-- doxytag: member="stp_image::height" ref="36cffb4418960b12743fc547902e35a6" args=")(struct stp_image *image)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__image.html#36cffb4418960b12743fc547902e35a6">stp_image::height</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+This callback returns the height of the image in pixels. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+  </table>
+</dl>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="9aebe24f43e2fe0d4342495a64026baa"></a><!-- doxytag: member="stp_image::init" ref="9aebe24f43e2fe0d4342495a64026baa" args=")(struct stp_image *image)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#9aebe24f43e2fe0d4342495a64026baa">stp_image::init</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -71,7 +199,93 @@ This callback is used to perform any initialization required by the image layer
 <p>
 It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use.</td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+  </table>
+</dl>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="75a384057459ae8e69fb9a98a249b4f4"></a><!-- doxytag: member="stp_image::rep" ref="75a384057459ae8e69fb9a98a249b4f4" args="" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__image.html#75a384057459ae8e69fb9a98a249b4f4">stp_image::rep</a>          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+A pointer to an application-specific state information that might need to be associated with the image object. 
+<p>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="edae63ed1524916fdef45cb652d7275e"></a><!-- doxytag: member="stp_image::reset" ref="edae63ed1524916fdef45cb652d7275e" args=")(struct stp_image *image)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__image.html#edae63ed1524916fdef45cb652d7275e">stp_image::reset</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+This callback is called to reset the image to the beginning. 
+<p>
+It may (in principle) be called multiple times if a page is being printed more than once. <dl compact><dt><b>Warning:</b></dt><dd>The <a class="el" href="structstp__image.html#edae63ed1524916fdef45cb652d7275e">reset()</a> call may be removed in the future. </dd></dl>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
+  </table>
+</dl>
+    </td>
+  </tr>
+</table>
+<a class="anchor" name="85ce2739e10b7c073f108a82b3e5d717"></a><!-- doxytag: member="stp_image::width" ref="85ce2739e10b7c073f108a82b3e5d717" args=")(struct stp_image *image)" --><p>
+<table class="mdTable" cellpadding="2" cellspacing="0">
+  <tr>
+    <td class="mdRow">
+      <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__image.html#85ce2739e10b7c073f108a82b3e5d717">stp_image::width</a>)(struct <a class="el" href="structstp__image.html">stp_image</a> *image)          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+<table cellspacing="5" cellpadding="0" border="0">
+  <tr>
+    <td>
+      &nbsp;
+    </td>
+    <td>
+
+<p>
+This callback returns the width of the image in pixels. 
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+  <table border="0" cellspacing="2" cellpadding="0">
+    <tr><td valign="top"></td><td valign="top"><em>image</em>&nbsp;</td><td>the image in use. </td></tr>
   </table>
 </dl>
     </td>
@@ -79,8 +293,8 @@ It will be called once per image. <dl compact><dt><b>Parameters:</b></dt><dd>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="image_8h.html">image.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__int__bound__t.html b/doc/gutenprint/html/structstp__int__bound__t.html
index 58c3465..fd170f6 100644
--- a/doc/gutenprint/html/structstp__int__bound__t.html
+++ b/doc/gutenprint/html/structstp__int__bound__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_int_bound_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_int_bound_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -15,23 +30,23 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#o0">lower</a></td></tr>
+<tr><td colspan="2"><br><h2>Public Types</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#81e073b428b50247daba38531dcf412a">lower</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#o1">upper</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__int__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">upper</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 int_bound (range) parameter. 
 <p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="o0" args="" --><p>
+<hr><h2>Member Typedef Documentation</h2>
+<a class="anchor" name="81e073b428b50247daba38531dcf412a"></a><!-- doxytag: member="stp_int_bound_t::lower" ref="81e073b428b50247daba38531dcf412a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__int__bound__t.html#o0">stp_int_bound_t::lower</a>          </td>
+          <td class="md" nowrap valign="top">typedef int <a class="el" href="structstp__int__bound__t.html#81e073b428b50247daba38531dcf412a">stp_int_bound_t::lower</a>          </td>
         </tr>
       </table>
     </td>
@@ -48,13 +63,13 @@ int_bound (range) parameter.
 Lower bound.     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="o1" args="" --><p>
+<a class="anchor" name="0122b4c2c01ee1c698ecc309d2b8eb5a"></a><!-- doxytag: member="stp_int_bound_t::upper" ref="0122b4c2c01ee1c698ecc309d2b8eb5a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__int__bound__t.html#o1">stp_int_bound_t::upper</a>          </td>
+          <td class="md" nowrap valign="top">typedef int <a class="el" href="structstp__int__bound__t.html#0122b4c2c01ee1c698ecc309d2b8eb5a">stp_int_bound_t::upper</a>          </td>
         </tr>
       </table>
     </td>
@@ -73,8 +88,8 @@ Upper bound.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineactive__t.html b/doc/gutenprint/html/structstp__lineactive__t.html
index 0fb4a93..b23a6d0 100644
--- a/doc/gutenprint/html/structstp__lineactive__t.html
+++ b/doc/gutenprint/html/structstp__lineactive__t.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_lineactive_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_lineactive_t Struct Reference</h1><!-- doxytag: class="stp_lineactive_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#7e65a932280df4e01f60294f031fb97e">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineactive__t.html#9e3669d19b675bd57058fd4664205d2a">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="o0" args="" --><p>
+<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_lineactive_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineactive__t.html#o0">stp_lineactive_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineactive__t.html#7e65a932280df4e01f60294f031fb97e">stp_lineactive_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_lineactive_t::v" ref="o1" args="" --><p>
+<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_lineactive_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__lineactive__t.html#o1">stp_lineactive_t::v</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__lineactive__t.html#9e3669d19b675bd57058fd4664205d2a">stp_lineactive_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebounds__t.html b/doc/gutenprint/html/structstp__linebounds__t.html
index 27c5739..778745a 100644
--- a/doc/gutenprint/html/structstp__linebounds__t.html
+++ b/doc/gutenprint/html/structstp__linebounds__t.html
@@ -2,29 +2,44 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_linebounds_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_linebounds_t Struct Reference</h1><!-- doxytag: class="stp_linebounds_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#7e65a932280df4e01f60294f031fb97e">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#o1">start_pos</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#8fb0bcdadf14357992c7faea15fb9497">start_pos</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#o2">end_pos</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html#1f90fb291292e9a933aa6aac4a9c857e">end_pos</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="o2" args="" --><p>
+<a class="anchor" name="1f90fb291292e9a933aa6aac4a9c857e"></a><!-- doxytag: member="stp_linebounds_t::end_pos" ref="1f90fb291292e9a933aa6aac4a9c857e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#o2">stp_linebounds_t::end_pos</a>          </td>
+          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#1f90fb291292e9a933aa6aac4a9c857e">stp_linebounds_t::end_pos</a>          </td>
         </tr>
       </table>
     </td>
@@ -41,13 +56,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="o0" args="" --><p>
+<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_linebounds_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebounds__t.html#o0">stp_linebounds_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebounds__t.html#7e65a932280df4e01f60294f031fb97e">stp_linebounds_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,13 +79,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="o1" args="" --><p>
+<a class="anchor" name="8fb0bcdadf14357992c7faea15fb9497"></a><!-- doxytag: member="stp_linebounds_t::start_pos" ref="8fb0bcdadf14357992c7faea15fb9497" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#o1">stp_linebounds_t::start_pos</a>          </td>
+          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linebounds__t.html#8fb0bcdadf14357992c7faea15fb9497">stp_linebounds_t::start_pos</a>          </td>
         </tr>
       </table>
     </td>
@@ -89,8 +104,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linebufs__t.html b/doc/gutenprint/html/structstp__linebufs__t.html
index f63eca6..0891576 100644
--- a/doc/gutenprint/html/structstp__linebufs__t.html
+++ b/doc/gutenprint/html/structstp__linebufs__t.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_linebufs_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_linebufs_t Struct Reference</h1><!-- doxytag: class="stp_linebufs_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#7e65a932280df4e01f60294f031fb97e">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char **&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebufs__t.html#9e3669d19b675bd57058fd4664205d2a">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="o0" args="" --><p>
+<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_linebufs_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebufs__t.html#o0">stp_linebufs_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linebufs__t.html#7e65a932280df4e01f60294f031fb97e">stp_linebufs_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linebufs_t::v" ref="o1" args="" --><p>
+<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_linebufs_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char** <a class="el" href="structstp__linebufs__t.html#o1">stp_linebufs_t::v</a>          </td>
+          <td class="md" nowrap valign="top">unsigned char** <a class="el" href="structstp__linebufs__t.html#9e3669d19b675bd57058fd4664205d2a">stp_linebufs_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__linecount__t.html b/doc/gutenprint/html/structstp__linecount__t.html
index 1a2a70e..ce4b8fa 100644
--- a/doc/gutenprint/html/structstp__linecount__t.html
+++ b/doc/gutenprint/html/structstp__linecount__t.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_linecount_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_linecount_t Struct Reference</h1><!-- doxytag: class="stp_linecount_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#7e65a932280df4e01f60294f031fb97e">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linecount__t.html#9e3669d19b675bd57058fd4664205d2a">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="o0" args="" --><p>
+<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_linecount_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linecount__t.html#o0">stp_linecount_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__linecount__t.html#7e65a932280df4e01f60294f031fb97e">stp_linecount_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_linecount_t::v" ref="o1" args="" --><p>
+<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_linecount_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linecount__t.html#o1">stp_linecount_t::v</a>          </td>
+          <td class="md" nowrap valign="top">int* <a class="el" href="structstp__linecount__t.html#9e3669d19b675bd57058fd4664205d2a">stp_linecount_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__lineoff__t.html b/doc/gutenprint/html/structstp__lineoff__t.html
index 7e5d919..353fed2 100644
--- a/doc/gutenprint/html/structstp__lineoff__t.html
+++ b/doc/gutenprint/html/structstp__lineoff__t.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_lineoff_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_lineoff_t Struct Reference</h1><!-- doxytag: class="stp_lineoff_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#o0">ncolors</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#7e65a932280df4e01f60294f031fb97e">ncolors</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#o1">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__lineoff__t.html#9e3669d19b675bd57058fd4664205d2a">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="o0" args="" --><p>
+<a class="anchor" name="7e65a932280df4e01f60294f031fb97e"></a><!-- doxytag: member="stp_lineoff_t::ncolors" ref="7e65a932280df4e01f60294f031fb97e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineoff__t.html#o0">stp_lineoff_t::ncolors</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__lineoff__t.html#7e65a932280df4e01f60294f031fb97e">stp_lineoff_t::ncolors</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_lineoff_t::v" ref="o1" args="" --><p>
+<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stp_lineoff_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned long* <a class="el" href="structstp__lineoff__t.html#o1">stp_lineoff_t::v</a>          </td>
+          <td class="md" nowrap valign="top">unsigned long* <a class="el" href="structstp__lineoff__t.html#9e3669d19b675bd57058fd4664205d2a">stp_lineoff_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module.html b/doc/gutenprint/html/structstp__module.html
index 50a6f8f..2f5a996 100644
--- a/doc/gutenprint/html/structstp__module.html
+++ b/doc/gutenprint/html/structstp__module.html
@@ -2,39 +2,54 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_module Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_module Struct Reference</h1><!-- doxytag: class="stp_module" --><code>#include &lt;module.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o1">version</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#2af72f100c356273d46284f6fd1dfc08">version</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o2">comment</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#06d4cd63bde972fc66a0aed41d2f5c51">comment</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="module_8h.html#a13">stp_module_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o3">class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#a2f2ed4f8ebc2cbb4c21a29dc40ab61d">class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o4">handle</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#e1260894f59eeae98c8440899de4df8d">handle</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o5">init</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#e410d3c31d3473619bad7812df075dd9">init</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o6">fini</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#b5296150c31e6581161fc46595a06b78">fini</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#o7">syms</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module.html#928a1fa51ea5f2eaae90429c74743ced">syms</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_module::class" ref="o3" args="" --><p>
+<a class="anchor" name="a2f2ed4f8ebc2cbb4c21a29dc40ab61d"></a><!-- doxytag: member="stp_module::class" ref="a2f2ed4f8ebc2cbb4c21a29dc40ab61d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="module_8h.html#a13">stp_module_class_t</a> <a class="el" href="structstp__module.html#o3">stp_module::class</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="module_8h.html#df2656b9a248237bdf28247c133a046d">stp_module_class_t</a> <a class="el" href="structstp__module.html#a2f2ed4f8ebc2cbb4c21a29dc40ab61d">stp_module::class</a>          </td>
         </tr>
       </table>
     </td>
@@ -51,13 +66,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_module::comment" ref="o2" args="" --><p>
+<a class="anchor" name="06d4cd63bde972fc66a0aed41d2f5c51"></a><!-- doxytag: member="stp_module::comment" ref="06d4cd63bde972fc66a0aed41d2f5c51" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o2">stp_module::comment</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#06d4cd63bde972fc66a0aed41d2f5c51">stp_module::comment</a>          </td>
         </tr>
       </table>
     </td>
@@ -74,13 +89,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_module::fini" ref="o6" args=")(void)" --><p>
+<a class="anchor" name="b5296150c31e6581161fc46595a06b78"></a><!-- doxytag: member="stp_module::fini" ref="b5296150c31e6581161fc46595a06b78" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#o6">stp_module::fini</a>)(void)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#b5296150c31e6581161fc46595a06b78">stp_module::fini</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -97,13 +112,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_module::handle" ref="o4" args="" --><p>
+<a class="anchor" name="e1260894f59eeae98c8440899de4df8d"></a><!-- doxytag: member="stp_module::handle" ref="e1260894f59eeae98c8440899de4df8d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#o4">stp_module::handle</a>          </td>
+          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#e1260894f59eeae98c8440899de4df8d">stp_module::handle</a>          </td>
         </tr>
       </table>
     </td>
@@ -120,13 +135,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_module::init" ref="o5" args=")(void)" --><p>
+<a class="anchor" name="e410d3c31d3473619bad7812df075dd9"></a><!-- doxytag: member="stp_module::init" ref="e410d3c31d3473619bad7812df075dd9" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#o5">stp_module::init</a>)(void)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__module.html#e410d3c31d3473619bad7812df075dd9">stp_module::init</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -143,13 +158,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_module::name" ref="o0" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_module::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o0">stp_module::name</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#b068931cc450442b63f5b3d276ea4297">stp_module::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -166,13 +181,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_module::syms" ref="o7" args="" --><p>
+<a class="anchor" name="928a1fa51ea5f2eaae90429c74743ced"></a><!-- doxytag: member="stp_module::syms" ref="928a1fa51ea5f2eaae90429c74743ced" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#o7">stp_module::syms</a>          </td>
+          <td class="md" nowrap valign="top">void* <a class="el" href="structstp__module.html#928a1fa51ea5f2eaae90429c74743ced">stp_module::syms</a>          </td>
         </tr>
       </table>
     </td>
@@ -189,13 +204,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_module::version" ref="o1" args="" --><p>
+<a class="anchor" name="2af72f100c356273d46284f6fd1dfc08"></a><!-- doxytag: member="stp_module::version" ref="2af72f100c356273d46284f6fd1dfc08" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#o1">stp_module::version</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__module.html#2af72f100c356273d46284f6fd1dfc08">stp_module::version</a>          </td>
         </tr>
       </table>
     </td>
@@ -214,8 +229,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__module__version.html b/doc/gutenprint/html/structstp__module__version.html
index 42883fb..68379a6 100644
--- a/doc/gutenprint/html/structstp__module__version.html
+++ b/doc/gutenprint/html/structstp__module__version.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_module_version Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_module_version Struct Reference</h1><!-- doxytag: class="stp_module_version" --><code>#include &lt;module.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#o0">major</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#f1425da40a9f2d21ab702a1c7feae026">major</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#o1">minor</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__module__version.html#ab846c0e3717a3e7d14af45cab70b44a">minor</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_module_version::major" ref="o0" args="" --><p>
+<a class="anchor" name="f1425da40a9f2d21ab702a1c7feae026"></a><!-- doxytag: member="stp_module_version::major" ref="f1425da40a9f2d21ab702a1c7feae026" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#o0">stp_module_version::major</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#f1425da40a9f2d21ab702a1c7feae026">stp_module_version::major</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_module_version::minor" ref="o1" args="" --><p>
+<a class="anchor" name="ab846c0e3717a3e7d14af45cab70b44a"></a><!-- doxytag: member="stp_module_version::minor" ref="ab846c0e3717a3e7d14af45cab70b44a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#o1">stp_module_version::minor</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__module__version.html#ab846c0e3717a3e7d14af45cab70b44a">stp_module_version::minor</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="module_8h.html">module.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__attr__s.html b/doc/gutenprint/html/structstp__mxml__attr__s.html
index 7799eb7..9686548 100644
--- a/doc/gutenprint/html/structstp__mxml__attr__s.html
+++ b/doc/gutenprint/html/structstp__mxml__attr__s.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_mxml_attr_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_mxml_attr_s Struct Reference</h1><!-- doxytag: class="stp_mxml_attr_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#o1">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__attr__s.html#2063c1608d6e0baf80249c42e2be5804">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="o0" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_mxml_attr_s::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#o0">stp_mxml_attr_s::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_attr_s::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="o1" args="" --><p>
+<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_mxml_attr_s::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#o1">stp_mxml_attr_s::value</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__attr__s.html#2063c1608d6e0baf80249c42e2be5804">stp_mxml_attr_s::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__node__s.html b/doc/gutenprint/html/structstp__mxml__node__s.html
index a0cd4a1..afb2a32 100644
--- a/doc/gutenprint/html/structstp__mxml__node__s.html
+++ b/doc/gutenprint/html/structstp__mxml__node__s.html
@@ -2,37 +2,52 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_mxml_node_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_mxml_node_s Struct Reference</h1><!-- doxytag: class="stp_mxml_node_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o0">type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#599dcce2998a6b40b1e38e8c6006cb0a">type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o1">next</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#d0cab90d8d20d57e2f2b9be52f7dd25d">next</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o2">prev</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#fcb08b164ac83e09964deb24f2d2e80b">prev</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o3">parent</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#d0e45878043844ffc41aac437e86b602">parent</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o4">child</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#1b7d5726533ab525a8760351e9b5e415">child</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o5">last_child</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#683657fb65ef37f597bddef3847a3eff">last_child</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#o6">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__node__s.html#2063c1608d6e0baf80249c42e2be5804">value</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="o4" args="" --><p>
+<a class="anchor" name="1b7d5726533ab525a8760351e9b5e415"></a><!-- doxytag: member="stp_mxml_node_s::child" ref="1b7d5726533ab525a8760351e9b5e415" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o4">stp_mxml_node_s::child</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#1b7d5726533ab525a8760351e9b5e415">stp_mxml_node_s::child</a>          </td>
         </tr>
       </table>
     </td>
@@ -49,13 +64,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="o5" args="" --><p>
+<a class="anchor" name="683657fb65ef37f597bddef3847a3eff"></a><!-- doxytag: member="stp_mxml_node_s::last_child" ref="683657fb65ef37f597bddef3847a3eff" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o5">stp_mxml_node_s::last_child</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#683657fb65ef37f597bddef3847a3eff">stp_mxml_node_s::last_child</a>          </td>
         </tr>
       </table>
     </td>
@@ -72,13 +87,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="o1" args="" --><p>
+<a class="anchor" name="d0cab90d8d20d57e2f2b9be52f7dd25d"></a><!-- doxytag: member="stp_mxml_node_s::next" ref="d0cab90d8d20d57e2f2b9be52f7dd25d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o1">stp_mxml_node_s::next</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#d0cab90d8d20d57e2f2b9be52f7dd25d">stp_mxml_node_s::next</a>          </td>
         </tr>
       </table>
     </td>
@@ -95,13 +110,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="o3" args="" --><p>
+<a class="anchor" name="d0e45878043844ffc41aac437e86b602"></a><!-- doxytag: member="stp_mxml_node_s::parent" ref="d0e45878043844ffc41aac437e86b602" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o3">stp_mxml_node_s::parent</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#d0e45878043844ffc41aac437e86b602">stp_mxml_node_s::parent</a>          </td>
         </tr>
       </table>
     </td>
@@ -118,13 +133,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="o2" args="" --><p>
+<a class="anchor" name="fcb08b164ac83e09964deb24f2d2e80b"></a><!-- doxytag: member="stp_mxml_node_s::prev" ref="fcb08b164ac83e09964deb24f2d2e80b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#o2">stp_mxml_node_s::prev</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* <a class="el" href="structstp__mxml__node__s.html#fcb08b164ac83e09964deb24f2d2e80b">stp_mxml_node_s::prev</a>          </td>
         </tr>
       </table>
     </td>
@@ -141,13 +156,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="o0" args="" --><p>
+<a class="anchor" name="599dcce2998a6b40b1e38e8c6006cb0a"></a><!-- doxytag: member="stp_mxml_node_s::type" ref="599dcce2998a6b40b1e38e8c6006cb0a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="mxml_8h.html#a14">stp_mxml_type_t</a> <a class="el" href="structstp__mxml__node__s.html#o0">stp_mxml_node_s::type</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="mxml_8h.html#1ed6fadf477121e16a83bc1899c30d5c">stp_mxml_type_t</a> <a class="el" href="structstp__mxml__node__s.html#599dcce2998a6b40b1e38e8c6006cb0a">stp_mxml_node_s::type</a>          </td>
         </tr>
       </table>
     </td>
@@ -164,13 +179,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="o6" args="" --><p>
+<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_mxml_node_s::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#o6">stp_mxml_node_s::value</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="unionstp__mxml__value__u.html">stp_mxml_value_t</a> <a class="el" href="structstp__mxml__node__s.html#2063c1608d6e0baf80249c42e2be5804">stp_mxml_node_s::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -189,8 +204,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__text__s.html b/doc/gutenprint/html/structstp__mxml__text__s.html
index b8291bf..8b23c53 100644
--- a/doc/gutenprint/html/structstp__mxml__text__s.html
+++ b/doc/gutenprint/html/structstp__mxml__text__s.html
@@ -2,27 +2,42 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_mxml_text_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_mxml_text_s Struct Reference</h1><!-- doxytag: class="stp_mxml_text_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#o0">whitespace</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#67b8601a11e47a9ee3bf08ddfd0b79ba">whitespace</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#o1">string</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__text__s.html#b45cffe084dd3d20d928bee85e7b0f21">string</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="o1" args="" --><p>
+<a class="anchor" name="b45cffe084dd3d20d928bee85e7b0f21"></a><!-- doxytag: member="stp_mxml_text_s::string" ref="b45cffe084dd3d20d928bee85e7b0f21" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__text__s.html#o1">stp_mxml_text_s::string</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__text__s.html#b45cffe084dd3d20d928bee85e7b0f21">stp_mxml_text_s::string</a>          </td>
         </tr>
       </table>
     </td>
@@ -39,13 +54,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="o0" args="" --><p>
+<a class="anchor" name="67b8601a11e47a9ee3bf08ddfd0b79ba"></a><!-- doxytag: member="stp_mxml_text_s::whitespace" ref="67b8601a11e47a9ee3bf08ddfd0b79ba" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__text__s.html#o0">stp_mxml_text_s::whitespace</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__text__s.html#67b8601a11e47a9ee3bf08ddfd0b79ba">stp_mxml_text_s::whitespace</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,8 +79,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__mxml__value__s.html b/doc/gutenprint/html/structstp__mxml__value__s.html
index 0a1d51f..df0857f 100644
--- a/doc/gutenprint/html/structstp__mxml__value__s.html
+++ b/doc/gutenprint/html/structstp__mxml__value__s.html
@@ -2,29 +2,44 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_mxml_value_s Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_mxml_value_s Struct Reference</h1><!-- doxytag: class="stp_mxml_value_s" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#o1">num_attrs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#30f1579a824317cbe2b6837454cd0ef1">num_attrs</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#o2">attrs</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__mxml__value__s.html#425ce871530e0633c917f98d8e9b1bc7">attrs</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="o2" args="" --><p>
+<a class="anchor" name="425ce871530e0633c917f98d8e9b1bc7"></a><!-- doxytag: member="stp_mxml_value_s::attrs" ref="425ce871530e0633c917f98d8e9b1bc7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__value__s.html#o2">stp_mxml_value_s::attrs</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__attr__s.html">stp_mxml_attr_t</a>* <a class="el" href="structstp__mxml__value__s.html#425ce871530e0633c917f98d8e9b1bc7">stp_mxml_value_s::attrs</a>          </td>
         </tr>
       </table>
     </td>
@@ -41,13 +56,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="o0" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_mxml_value_s::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__value__s.html#o0">stp_mxml_value_s::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__mxml__value__s.html#b068931cc450442b63f5b3d276ea4297">stp_mxml_value_s::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,13 +79,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="o1" args="" --><p>
+<a class="anchor" name="30f1579a824317cbe2b6837454cd0ef1"></a><!-- doxytag: member="stp_mxml_value_s::num_attrs" ref="30f1579a824317cbe2b6837454cd0ef1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__value__s.html#o1">stp_mxml_value_s::num_attrs</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__mxml__value__s.html#30f1579a824317cbe2b6837454cd0ef1">stp_mxml_value_s::num_attrs</a>          </td>
         </tr>
       </table>
     </td>
@@ -89,8 +104,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__papersize__t.html b/doc/gutenprint/html/structstp__papersize__t.html
index d5095e7..6cc253d 100644
--- a/doc/gutenprint/html/structstp__papersize__t.html
+++ b/doc/gutenprint/html/structstp__papersize__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_papersize_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_papersize_t Struct Reference<br>
 <small>
 [<a class="el" href="group__papersize.html">papersize</a>]</small>
@@ -16,48 +31,48 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Short unique name (not translated).  <a href="#o0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o1">text</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Short unique name (not translated).  <a href="#b068931cc450442b63f5b3d276ea4297"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#1cb251ec0d568de6a929b520c4aed8d1">text</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Long descriptive name (translated).  <a href="#o1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o2">comment</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Long descriptive name (translated).  <a href="#1cb251ec0d568de6a929b520c4aed8d1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#06d4cd63bde972fc66a0aed41d2f5c51">comment</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Comment.  <a href="#o2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o3">width</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Comment.  <a href="#06d4cd63bde972fc66a0aed41d2f5c51"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#eaae26a6fb20ed3ef54fb23bfa0b1fcc">width</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper width.  <a href="#o3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o4">height</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper width.  <a href="#eaae26a6fb20ed3ef54fb23bfa0b1fcc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#b435e227d5dd201e1768b2bcb2e0aa81">height</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper height.  <a href="#o4"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o5">top</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Paper height.  <a href="#b435e227d5dd201e1768b2bcb2e0aa81"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#b28354b543375bfa94dabaeda722927f">top</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Top margin.  <a href="#o5"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o6">left</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Top margin.  <a href="#b28354b543375bfa94dabaeda722927f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#811882fecd5c7618d7099ebbd39ea254">left</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Left margin.  <a href="#o6"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o7">bottom</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Left margin.  <a href="#811882fecd5c7618d7099ebbd39ea254"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#71f262d796bed1ab30e8a2d5a8ddee6f">bottom</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Bottom margin.  <a href="#o7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o8">right</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Bottom margin.  <a href="#71f262d796bed1ab30e8a2d5a8ddee6f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#7c4f29407893c334a6cb7a87bf045c0d">right</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Right margin.  <a href="#o8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#o9">paper_unit</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Right margin.  <a href="#7c4f29407893c334a6cb7a87bf045c0d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__papersize__t.html#00a9745ae8b0126b5763ba88daba837b">paper_unit</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="#o9"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Units of measurement.  <a href="#00a9745ae8b0126b5763ba88daba837b"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 The papersize data type. 
 <p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="o7" args="" --><p>
+<a class="anchor" name="71f262d796bed1ab30e8a2d5a8ddee6f"></a><!-- doxytag: member="stp_papersize_t::bottom" ref="71f262d796bed1ab30e8a2d5a8ddee6f" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o7">stp_papersize_t::bottom</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#71f262d796bed1ab30e8a2d5a8ddee6f">stp_papersize_t::bottom</a>          </td>
         </tr>
       </table>
     </td>
@@ -76,13 +91,13 @@ Bottom margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_papersize_t::comment" ref="o2" args="" --><p>
+<a class="anchor" name="06d4cd63bde972fc66a0aed41d2f5c51"></a><!-- doxytag: member="stp_papersize_t::comment" ref="06d4cd63bde972fc66a0aed41d2f5c51" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o2">stp_papersize_t::comment</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#06d4cd63bde972fc66a0aed41d2f5c51">stp_papersize_t::comment</a>          </td>
         </tr>
       </table>
     </td>
@@ -101,13 +116,13 @@ Comment.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_papersize_t::height" ref="o4" args="" --><p>
+<a class="anchor" name="b435e227d5dd201e1768b2bcb2e0aa81"></a><!-- doxytag: member="stp_papersize_t::height" ref="b435e227d5dd201e1768b2bcb2e0aa81" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o4">stp_papersize_t::height</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#b435e227d5dd201e1768b2bcb2e0aa81">stp_papersize_t::height</a>          </td>
         </tr>
       </table>
     </td>
@@ -126,13 +141,13 @@ Paper height.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_papersize_t::left" ref="o6" args="" --><p>
+<a class="anchor" name="811882fecd5c7618d7099ebbd39ea254"></a><!-- doxytag: member="stp_papersize_t::left" ref="811882fecd5c7618d7099ebbd39ea254" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o6">stp_papersize_t::left</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#811882fecd5c7618d7099ebbd39ea254">stp_papersize_t::left</a>          </td>
         </tr>
       </table>
     </td>
@@ -151,13 +166,13 @@ Left margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_papersize_t::name" ref="o0" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_papersize_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o0">stp_papersize_t::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#b068931cc450442b63f5b3d276ea4297">stp_papersize_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -176,13 +191,13 @@ Short unique name (not translated).
     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="o9" args="" --><p>
+<a class="anchor" name="00a9745ae8b0126b5763ba88daba837b"></a><!-- doxytag: member="stp_papersize_t::paper_unit" ref="00a9745ae8b0126b5763ba88daba837b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__papersize.html#ga5">stp_papersize_unit_t</a> <a class="el" href="structstp__papersize__t.html#o9">stp_papersize_t::paper_unit</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__papersize.html#gbb66a8f6ce85d70afd9fe42472b492d8">stp_papersize_unit_t</a> <a class="el" href="structstp__papersize__t.html#00a9745ae8b0126b5763ba88daba837b">stp_papersize_t::paper_unit</a>          </td>
         </tr>
       </table>
     </td>
@@ -201,13 +216,13 @@ Units of measurement.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_papersize_t::right" ref="o8" args="" --><p>
+<a class="anchor" name="7c4f29407893c334a6cb7a87bf045c0d"></a><!-- doxytag: member="stp_papersize_t::right" ref="7c4f29407893c334a6cb7a87bf045c0d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o8">stp_papersize_t::right</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#7c4f29407893c334a6cb7a87bf045c0d">stp_papersize_t::right</a>          </td>
         </tr>
       </table>
     </td>
@@ -226,13 +241,13 @@ Right margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_papersize_t::text" ref="o1" args="" --><p>
+<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_papersize_t::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#o1">stp_papersize_t::text</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstp__papersize__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_papersize_t::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -251,13 +266,13 @@ Long descriptive name (translated).
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_papersize_t::top" ref="o5" args="" --><p>
+<a class="anchor" name="b28354b543375bfa94dabaeda722927f"></a><!-- doxytag: member="stp_papersize_t::top" ref="b28354b543375bfa94dabaeda722927f" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o5">stp_papersize_t::top</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#b28354b543375bfa94dabaeda722927f">stp_papersize_t::top</a>          </td>
         </tr>
       </table>
     </td>
@@ -276,13 +291,13 @@ Top margin.
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_papersize_t::width" ref="o3" args="" --><p>
+<a class="anchor" name="eaae26a6fb20ed3ef54fb23bfa0b1fcc"></a><!-- doxytag: member="stp_papersize_t::width" ref="eaae26a6fb20ed3ef54fb23bfa0b1fcc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#o3">stp_papersize_t::width</a>          </td>
+          <td class="md" nowrap valign="top">unsigned <a class="el" href="structstp__papersize__t.html#eaae26a6fb20ed3ef54fb23bfa0b1fcc">stp_papersize_t::width</a>          </td>
         </tr>
       </table>
     </td>
@@ -303,8 +318,8 @@ Paper width.
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="paper_8h.html">paper.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__param__string__t.html b/doc/gutenprint/html/structstp__param__string__t.html
index 4a9dac6..a47c363 100644
--- a/doc/gutenprint/html/structstp__param__string__t.html
+++ b/doc/gutenprint/html/structstp__param__string__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_param_string_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_param_string_t Struct Reference</h1><!-- doxytag: class="stp_param_string_t" -->String parameter.  
 <a href="#_details">More...</a>
 <p>
@@ -13,24 +28,24 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#o1">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__param__string__t.html#1cb251ec0d568de6a929b520c4aed8d1">text</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 String parameter. 
 <p>
-Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque.
+Representation of a choice list of strings. The choices themselves consist of a key and a human-readable name. The list object is opaque. 
 <p>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_param_string_t::name" ref="o0" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_param_string_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__param__string__t.html#o0">stp_param_string_t::name</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__param__string__t.html#b068931cc450442b63f5b3d276ea4297">stp_param_string_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -47,13 +62,13 @@ Representation of a choice list of strings. The choices themselves consist of a
 Option name (key, untranslated).     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_param_string_t::text" ref="o1" args="" --><p>
+<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_param_string_t::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char * <a class="el" href="structstp__param__string__t.html#o1">stp_param_string_t::text</a>          </td>
+          <td class="md" nowrap valign="top">const char * <a class="el" href="structstp__param__string__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_param_string_t::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -72,8 +87,8 @@ Human-readable (translated) text.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="string-list_8h.html">string-list.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__parameter__t.html b/doc/gutenprint/html/structstp__parameter__t.html
index 5c7d5ed..b8a226a 100644
--- a/doc/gutenprint/html/structstp__parameter__t.html
+++ b/doc/gutenprint/html/structstp__parameter__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_parameter_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_parameter_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -15,77 +30,78 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o0">name</a></td></tr>
+<tr><td colspan="2"><br><h2>Public Types</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o1">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#1cb251ec0d568de6a929b520c4aed8d1">text</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o2">category</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#c4ef352f74e502ef5e7bc98e6f4e493d">category</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o3">help</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#657f8b8da628ef83cf69101b6817150a">help</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o4">p_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_type_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#ee532d298de9538e682d9a1eaea12378">p_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o5">p_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_class_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#8112bb5792909f9417d1f6d2ab36863a">p_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o6">p_level</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_level_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#c52b547d5a185fa1e792e175f90d24fc">p_level</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o7">is_mandatory</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#c261f1bf67a23fb36eadbb2c644c162f">is_mandatory</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o8">is_active</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#4264c638e0098acb172519b0436db099">is_active</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o9">channel</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#c485d2ed5cc4ce64fcccca710c7a0bb7">channel</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o10">verify_this_parameter</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#f07c856ac0ac425e65f87fff7a12b34d">verify_this_parameter</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o11">read_only</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef unsigned char&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#befe72871b2de8f4f0e20108517e31fe">read_only</a></td></tr>
 
+<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
 <tr><td class="memItemLeft" nowrap>union {</td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o12">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o13">dbl</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#365b8373d0bf6dc9e3450af670cc1d35">dbl</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o14">integer</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#157db7df530023575515d366c9b672e8">integer</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o15">dimension</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a>&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#c4cf4802b30127a6ae42a1a1798c51b3">dimension</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="string-list_8h.html#a0">stp_string_list_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o16">str</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">str</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o17">array</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">array</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o18">bounds</a></td></tr>
+<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#eb49194cccc646fc8e93a368301834ea">bounds</a></td></tr>
 
 <tr><td class="memItemLeft" nowrap>union {</td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o19">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;double&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o20">dbl</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;double&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#365b8373d0bf6dc9e3450af670cc1d35">dbl</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o21">dimension</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#c4cf4802b30127a6ae42a1a1798c51b3">dimension</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o22">integer</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#157db7df530023575515d366c9b672e8">integer</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o23">boolean</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;int&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#84e2c64f38f78ba3ea5c905ab5a2da27">boolean</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;const char *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o24">str</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;const char *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">str</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#o25">array</a></td></tr>
+<tr><td class="memItemLeft" nowrap>&nbsp;&nbsp;&nbsp;<a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;&nbsp;&nbsp;<a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">array</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#o26">deflt</a></td></tr>
+<tr><td class="memItemLeft" nowrap valign="top">}&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__parameter__t.html#1ae03ed771e3171fae03ed917b22ceff">deflt</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Parameter description. 
 <p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o25"></a><!-- doxytag: member="stp_parameter_t::array" ref="o25" args="" --><p>
+<hr><h2>Member Typedef Documentation</h2>
+<a class="anchor" name="c4ef352f74e502ef5e7bc98e6f4e493d"></a><!-- doxytag: member="stp_parameter_t::category" ref="c4ef352f74e502ef5e7bc98e6f4e493d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#o17">stp_parameter_t::array</a>          </td>
+          <td class="md" nowrap valign="top">typedef const char* <a class="el" href="structstp__parameter__t.html#c4ef352f74e502ef5e7bc98e6f4e493d">stp_parameter_t::category</a>          </td>
         </tr>
       </table>
     </td>
@@ -99,16 +115,16 @@ Parameter description.
     <td>
 
 <p>
-Default array parameter value.     </td>
+User-visible category name.     </td>
   </tr>
 </table>
-<a class="anchor" name="o17"></a><!-- doxytag: member="stp_parameter_t::array" ref="o17" args="" --><p>
+<a class="anchor" name="c485d2ed5cc4ce64fcccca710c7a0bb7"></a><!-- doxytag: member="stp_parameter_t::channel" ref="c485d2ed5cc4ce64fcccca710c7a0bb7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#o17">stp_parameter_t::array</a>          </td>
+          <td class="md" nowrap valign="top">typedef unsigned char <a class="el" href="structstp__parameter__t.html#c485d2ed5cc4ce64fcccca710c7a0bb7">stp_parameter_t::channel</a>          </td>
         </tr>
       </table>
     </td>
@@ -122,16 +138,16 @@ Default array parameter value.     </td>
     <td>
 
 <p>
-array parameter value.     </td>
+The channel to which this parameter applies     </td>
   </tr>
 </table>
-<a class="anchor" name="o23"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="o23" args="" --><p>
+<a class="anchor" name="657f8b8da628ef83cf69101b6817150a"></a><!-- doxytag: member="stp_parameter_t::help" ref="657f8b8da628ef83cf69101b6817150a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o23">stp_parameter_t::boolean</a>          </td>
+          <td class="md" nowrap valign="top">typedef const char* <a class="el" href="structstp__parameter__t.html#657f8b8da628ef83cf69101b6817150a">stp_parameter_t::help</a>          </td>
         </tr>
       </table>
     </td>
@@ -145,16 +161,16 @@ array parameter value.     </td>
     <td>
 
 <p>
-Default boolean parameter value.     </td>
+Help string.     </td>
   </tr>
 </table>
-<a class="anchor" name="o18"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="o18" args="" --><p>
+<a class="anchor" name="4264c638e0098acb172519b0436db099"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="4264c638e0098acb172519b0436db099" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#o18">stp_parameter_t::bounds</a>          </td>
+          <td class="md" nowrap valign="top">typedef unsigned char <a class="el" href="structstp__parameter__t.html#4264c638e0098acb172519b0436db099">stp_parameter_t::is_active</a>          </td>
         </tr>
       </table>
     </td>
@@ -168,16 +184,16 @@ Default boolean parameter value.     </td>
     <td>
 
 <p>
-Limits on the values the parameter may take.     </td>
+Is the parameter active?     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_parameter_t::category" ref="o2" args="" --><p>
+<a class="anchor" name="c261f1bf67a23fb36eadbb2c644c162f"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="c261f1bf67a23fb36eadbb2c644c162f" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o2">stp_parameter_t::category</a>          </td>
+          <td class="md" nowrap valign="top">typedef unsigned char <a class="el" href="structstp__parameter__t.html#c261f1bf67a23fb36eadbb2c644c162f">stp_parameter_t::is_mandatory</a>          </td>
         </tr>
       </table>
     </td>
@@ -191,16 +207,16 @@ Limits on the values the parameter may take.     </td>
     <td>
 
 <p>
-User-visible category name.     </td>
+The parameter is required, even when set inactive.     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_parameter_t::channel" ref="o9" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stp_parameter_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o9">stp_parameter_t::channel</a>          </td>
+          <td class="md" nowrap valign="top">typedef const char* <a class="el" href="structstp__parameter__t.html#b068931cc450442b63f5b3d276ea4297">stp_parameter_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -214,16 +230,16 @@ User-visible category name.     </td>
     <td>
 
 <p>
-The channel to which this parameter applies     </td>
+Internal name (key).     </td>
   </tr>
 </table>
-<a class="anchor" name="o19"></a><!-- doxytag: member="stp_parameter_t::curve" ref="o19" args="" --><p>
+<a class="anchor" name="8112bb5792909f9417d1f6d2ab36863a"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="8112bb5792909f9417d1f6d2ab36863a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#o12">stp_parameter_t::curve</a>          </td>
+          <td class="md" nowrap valign="top">typedef <a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_class_t</a> <a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_t::p_class</a>          </td>
         </tr>
       </table>
     </td>
@@ -237,16 +253,16 @@ The channel to which this parameter applies     </td>
     <td>
 
 <p>
-Default curve parameter value.     </td>
+Parameter class.     </td>
   </tr>
 </table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="stp_parameter_t::curve" ref="o12" args="" --><p>
+<a class="anchor" name="c52b547d5a185fa1e792e175f90d24fc"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="c52b547d5a185fa1e792e175f90d24fc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#o12">stp_parameter_t::curve</a>          </td>
+          <td class="md" nowrap valign="top">typedef <a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_level_t</a> <a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_t::p_level</a>          </td>
         </tr>
       </table>
     </td>
@@ -260,16 +276,16 @@ Default curve parameter value.     </td>
     <td>
 
 <p>
-curve parameter value.     </td>
+Parameter level.     </td>
   </tr>
 </table>
-<a class="anchor" name="o20"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="o20" args="" --><p>
+<a class="anchor" name="ee532d298de9538e682d9a1eaea12378"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="ee532d298de9538e682d9a1eaea12378" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__parameter__t.html#o13">stp_parameter_t::dbl</a>          </td>
+          <td class="md" nowrap valign="top">typedef <a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_type_t</a> <a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_t::p_type</a>          </td>
         </tr>
       </table>
     </td>
@@ -283,16 +299,16 @@ curve parameter value.     </td>
     <td>
 
 <p>
-Default double parameter value.     </td>
+Parameter type.     </td>
   </tr>
 </table>
-<a class="anchor" name="o13"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="o13" args="" --><p>
+<a class="anchor" name="befe72871b2de8f4f0e20108517e31fe"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="befe72871b2de8f4f0e20108517e31fe" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a> <a class="el" href="structstp__parameter__t.html#o13">stp_parameter_t::dbl</a>          </td>
+          <td class="md" nowrap valign="top">typedef unsigned char <a class="el" href="structstp__parameter__t.html#befe72871b2de8f4f0e20108517e31fe">stp_parameter_t::read_only</a>          </td>
         </tr>
       </table>
     </td>
@@ -306,16 +322,16 @@ Default double parameter value.     </td>
     <td>
 
 <p>
-double_bound parameter value.     </td>
+    </td>
   </tr>
 </table>
-<a class="anchor" name="o26"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="o26" args="" --><p>
+<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_parameter_t::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#o26">stp_parameter_t::deflt</a>          </td>
+          <td class="md" nowrap valign="top">typedef const char* <a class="el" href="structstp__parameter__t.html#1cb251ec0d568de6a929b520c4aed8d1">stp_parameter_t::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -329,16 +345,16 @@ double_bound parameter value.     </td>
     <td>
 
 <p>
-Default value of the parameter.     </td>
+User-visible name.     </td>
   </tr>
 </table>
-<a class="anchor" name="o21"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="o21" args="" --><p>
+<a class="anchor" name="f07c856ac0ac425e65f87fff7a12b34d"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="f07c856ac0ac425e65f87fff7a12b34d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o15">stp_parameter_t::dimension</a>          </td>
+          <td class="md" nowrap valign="top">typedef unsigned char <a class="el" href="structstp__parameter__t.html#f07c856ac0ac425e65f87fff7a12b34d">stp_parameter_t::verify_this_parameter</a>          </td>
         </tr>
       </table>
     </td>
@@ -352,16 +368,17 @@ Default value of the parameter.     </td>
     <td>
 
 <p>
-Default dimension parameter value.     </td>
+Should the verify system check this parameter?     </td>
   </tr>
 </table>
-<a class="anchor" name="o15"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="o15" args="" --><p>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="f1f713c9e000f5d3f280adbd124df4f5"></a><!-- doxytag: member="stp_parameter_t::array" ref="f1f713c9e000f5d3f280adbd124df4f5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#o15">stp_parameter_t::dimension</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t::array</a>          </td>
         </tr>
       </table>
     </td>
@@ -375,16 +392,16 @@ Default dimension parameter value.     </td>
     <td>
 
 <p>
-int_bound parameter value.     </td>
+Default array parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_parameter_t::help" ref="o3" args="" --><p>
+<a class="anchor" name="f1f713c9e000f5d3f280adbd124df4f5"></a><!-- doxytag: member="stp_parameter_t::array" ref="f1f713c9e000f5d3f280adbd124df4f5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o3">stp_parameter_t::help</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* <a class="el" href="structstp__parameter__t.html#f1f713c9e000f5d3f280adbd124df4f5">stp_parameter_t::array</a>          </td>
         </tr>
       </table>
     </td>
@@ -398,16 +415,16 @@ int_bound parameter value.     </td>
     <td>
 
 <p>
-Help string.     </td>
+array parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o22"></a><!-- doxytag: member="stp_parameter_t::integer" ref="o22" args="" --><p>
+<a class="anchor" name="84e2c64f38f78ba3ea5c905ab5a2da27"></a><!-- doxytag: member="stp_parameter_t::boolean" ref="84e2c64f38f78ba3ea5c905ab5a2da27" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#o14">stp_parameter_t::integer</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#84e2c64f38f78ba3ea5c905ab5a2da27">stp_parameter_t::boolean</a>          </td>
         </tr>
       </table>
     </td>
@@ -421,16 +438,16 @@ Help string.     </td>
     <td>
 
 <p>
-Default int parameter value.     </td>
+Default boolean parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o14"></a><!-- doxytag: member="stp_parameter_t::integer" ref="o14" args="" --><p>
+<a class="anchor" name="eb49194cccc646fc8e93a368301834ea"></a><!-- doxytag: member="stp_parameter_t::bounds" ref="eb49194cccc646fc8e93a368301834ea" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#o14">stp_parameter_t::integer</a>          </td>
+          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#eb49194cccc646fc8e93a368301834ea">stp_parameter_t::bounds</a>          </td>
         </tr>
       </table>
     </td>
@@ -444,16 +461,16 @@ Default int parameter value.     </td>
     <td>
 
 <p>
-int_bound parameter value.     </td>
+Limits on the values the parameter may take.     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_parameter_t::is_active" ref="o8" args="" --><p>
+<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="stp_parameter_t::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o8">stp_parameter_t::is_active</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_parameter_t::curve</a>          </td>
         </tr>
       </table>
     </td>
@@ -467,16 +484,16 @@ int_bound parameter value.     </td>
     <td>
 
 <p>
-Is the parameter active?     </td>
+Default curve parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_parameter_t::is_mandatory" ref="o7" args="" --><p>
+<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="stp_parameter_t::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o7">stp_parameter_t::is_mandatory</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* <a class="el" href="structstp__parameter__t.html#4efa264f5ef3e1a5c95736e07544ebf0">stp_parameter_t::curve</a>          </td>
         </tr>
       </table>
     </td>
@@ -490,16 +507,16 @@ Is the parameter active?     </td>
     <td>
 
 <p>
-The parameter is required, even when set inactive.     </td>
+curve parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_parameter_t::name" ref="o0" args="" --><p>
+<a class="anchor" name="365b8373d0bf6dc9e3450af670cc1d35"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="365b8373d0bf6dc9e3450af670cc1d35" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o0">stp_parameter_t::name</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__parameter__t.html#365b8373d0bf6dc9e3450af670cc1d35">stp_parameter_t::dbl</a>          </td>
         </tr>
       </table>
     </td>
@@ -513,16 +530,16 @@ The parameter is required, even when set inactive.     </td>
     <td>
 
 <p>
-Internal name (key).     </td>
+Default double parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_parameter_t::p_class" ref="o5" args="" --><p>
+<a class="anchor" name="365b8373d0bf6dc9e3450af670cc1d35"></a><!-- doxytag: member="stp_parameter_t::dbl" ref="365b8373d0bf6dc9e3450af670cc1d35" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a> <a class="el" href="structstp__parameter__t.html#o5">stp_parameter_t::p_class</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__double__bound__t.html">stp_double_bound_t</a> <a class="el" href="structstp__parameter__t.html#365b8373d0bf6dc9e3450af670cc1d35">stp_parameter_t::dbl</a>          </td>
         </tr>
       </table>
     </td>
@@ -536,16 +553,16 @@ Internal name (key).     </td>
     <td>
 
 <p>
-Parameter class.     </td>
+double_bound parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_parameter_t::p_level" ref="o6" args="" --><p>
+<a class="anchor" name="1ae03ed771e3171fae03ed917b22ceff"></a><!-- doxytag: member="stp_parameter_t::deflt" ref="1ae03ed771e3171fae03ed917b22ceff" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a> <a class="el" href="structstp__parameter__t.html#o6">stp_parameter_t::p_level</a>          </td>
+          <td class="md" nowrap valign="top">union { ... }   <a class="el" href="structstp__parameter__t.html#1ae03ed771e3171fae03ed917b22ceff">stp_parameter_t::deflt</a>          </td>
         </tr>
       </table>
     </td>
@@ -559,16 +576,16 @@ Parameter class.     </td>
     <td>
 
 <p>
-Parameter level.     </td>
+Default value of the parameter.     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_parameter_t::p_type" ref="o4" args="" --><p>
+<a class="anchor" name="c4cf4802b30127a6ae42a1a1798c51b3"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="c4cf4802b30127a6ae42a1a1798c51b3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a> <a class="el" href="structstp__parameter__t.html#o4">stp_parameter_t::p_type</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#c4cf4802b30127a6ae42a1a1798c51b3">stp_parameter_t::dimension</a>          </td>
         </tr>
       </table>
     </td>
@@ -582,16 +599,16 @@ Parameter level.     </td>
     <td>
 
 <p>
-Parameter type.     </td>
+Default dimension parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="stp_parameter_t::read_only" ref="o11" args="" --><p>
+<a class="anchor" name="c4cf4802b30127a6ae42a1a1798c51b3"></a><!-- doxytag: member="stp_parameter_t::dimension" ref="c4cf4802b30127a6ae42a1a1798c51b3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o11">stp_parameter_t::read_only</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#c4cf4802b30127a6ae42a1a1798c51b3">stp_parameter_t::dimension</a>          </td>
         </tr>
       </table>
     </td>
@@ -605,16 +622,16 @@ Parameter type.     </td>
     <td>
 
 <p>
-    </td>
+int_bound parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o24"></a><!-- doxytag: member="stp_parameter_t::str" ref="o24" args="" --><p>
+<a class="anchor" name="157db7df530023575515d366c9b672e8"></a><!-- doxytag: member="stp_parameter_t::integer" ref="157db7df530023575515d366c9b672e8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o16">stp_parameter_t::str</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__parameter__t.html#157db7df530023575515d366c9b672e8">stp_parameter_t::integer</a>          </td>
         </tr>
       </table>
     </td>
@@ -628,16 +645,16 @@ Parameter type.     </td>
     <td>
 
 <p>
-Default string parameter value.     </td>
+Default int parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o16"></a><!-- doxytag: member="stp_parameter_t::str" ref="o16" args="" --><p>
+<a class="anchor" name="157db7df530023575515d366c9b672e8"></a><!-- doxytag: member="stp_parameter_t::integer" ref="157db7df530023575515d366c9b672e8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#a0">stp_string_list_t</a>* <a class="el" href="structstp__parameter__t.html#o16">stp_parameter_t::str</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__int__bound__t.html">stp_int_bound_t</a> <a class="el" href="structstp__parameter__t.html#157db7df530023575515d366c9b672e8">stp_parameter_t::integer</a>          </td>
         </tr>
       </table>
     </td>
@@ -651,16 +668,16 @@ Default string parameter value.     </td>
     <td>
 
 <p>
-string_list parameter value.     </td>
+int_bound parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_parameter_t::text" ref="o1" args="" --><p>
+<a class="anchor" name="341be97d9aff90c9978347f66f945b77"></a><!-- doxytag: member="stp_parameter_t::str" ref="341be97d9aff90c9978347f66f945b77" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#o1">stp_parameter_t::text</a>          </td>
+          <td class="md" nowrap valign="top">const char* <a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">stp_parameter_t::str</a>          </td>
         </tr>
       </table>
     </td>
@@ -674,16 +691,16 @@ string_list parameter value.     </td>
     <td>
 
 <p>
-User-visible name.     </td>
+Default string parameter value.     </td>
   </tr>
 </table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stp_parameter_t::verify_this_parameter" ref="o10" args="" --><p>
+<a class="anchor" name="341be97d9aff90c9978347f66f945b77"></a><!-- doxytag: member="stp_parameter_t::str" ref="341be97d9aff90c9978347f66f945b77" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">unsigned char <a class="el" href="structstp__parameter__t.html#o10">stp_parameter_t::verify_this_parameter</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="string-list_8h.html#6ec7eafa9cb77e5c4c2502e19f1a3f5b">stp_string_list_t</a>* <a class="el" href="structstp__parameter__t.html#341be97d9aff90c9978347f66f945b77">stp_parameter_t::str</a>          </td>
         </tr>
       </table>
     </td>
@@ -697,13 +714,13 @@ User-visible name.     </td>
     <td>
 
 <p>
-Should the verify system check this parameter?     </td>
+string_list parameter value.     </td>
   </tr>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__pass__t.html b/doc/gutenprint/html/structstp__pass__t.html
index 1cbc3ab..602574c 100644
--- a/doc/gutenprint/html/structstp__pass__t.html
+++ b/doc/gutenprint/html/structstp__pass__t.html
@@ -2,35 +2,50 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_pass_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_pass_t Struct Reference</h1><!-- doxytag: class="stp_pass_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o0">pass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#1a1dc91c907325c69271ddf0c944bc72">pass</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o1">missingstartrows</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#6b75dc88fe75f396206e0c5862d61543">missingstartrows</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o2">logicalpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#da94ad894675e9119f2c647a94e21605">logicalpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o3">physpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#13436ac9693968e5601e30fd01451a02">physpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o4">physpassend</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#102875318f07394cc762ba839e0b5231">physpassend</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#o5">subpass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__pass__t.html#769ff675e6c6adb86faf4316c1aa0ba3">subpass</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="o2" args="" --><p>
+<a class="anchor" name="da94ad894675e9119f2c647a94e21605"></a><!-- doxytag: member="stp_pass_t::logicalpassstart" ref="da94ad894675e9119f2c647a94e21605" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o2">stp_pass_t::logicalpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#da94ad894675e9119f2c647a94e21605">stp_pass_t::logicalpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -47,13 +62,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="o1" args="" --><p>
+<a class="anchor" name="6b75dc88fe75f396206e0c5862d61543"></a><!-- doxytag: member="stp_pass_t::missingstartrows" ref="6b75dc88fe75f396206e0c5862d61543" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o1">stp_pass_t::missingstartrows</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#6b75dc88fe75f396206e0c5862d61543">stp_pass_t::missingstartrows</a>          </td>
         </tr>
       </table>
     </td>
@@ -70,13 +85,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_pass_t::pass" ref="o0" args="" --><p>
+<a class="anchor" name="1a1dc91c907325c69271ddf0c944bc72"></a><!-- doxytag: member="stp_pass_t::pass" ref="1a1dc91c907325c69271ddf0c944bc72" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o0">stp_pass_t::pass</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#1a1dc91c907325c69271ddf0c944bc72">stp_pass_t::pass</a>          </td>
         </tr>
       </table>
     </td>
@@ -93,13 +108,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="o4" args="" --><p>
+<a class="anchor" name="102875318f07394cc762ba839e0b5231"></a><!-- doxytag: member="stp_pass_t::physpassend" ref="102875318f07394cc762ba839e0b5231" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o4">stp_pass_t::physpassend</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#102875318f07394cc762ba839e0b5231">stp_pass_t::physpassend</a>          </td>
         </tr>
       </table>
     </td>
@@ -116,13 +131,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="o3" args="" --><p>
+<a class="anchor" name="13436ac9693968e5601e30fd01451a02"></a><!-- doxytag: member="stp_pass_t::physpassstart" ref="13436ac9693968e5601e30fd01451a02" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o3">stp_pass_t::physpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#13436ac9693968e5601e30fd01451a02">stp_pass_t::physpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -139,13 +154,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_pass_t::subpass" ref="o5" args="" --><p>
+<a class="anchor" name="769ff675e6c6adb86faf4316c1aa0ba3"></a><!-- doxytag: member="stp_pass_t::subpass" ref="769ff675e6c6adb86faf4316c1aa0ba3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#o5">stp_pass_t::subpass</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__pass__t.html#769ff675e6c6adb86faf4316c1aa0ba3">stp_pass_t::subpass</a>          </td>
         </tr>
       </table>
     </td>
@@ -164,8 +179,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__printfuncs__t.html b/doc/gutenprint/html/structstp__printfuncs__t.html
index ae13fcc..371b800 100644
--- a/doc/gutenprint/html/structstp__printfuncs__t.html
+++ b/doc/gutenprint/html/structstp__printfuncs__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_printfuncs_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_printfuncs_t Struct Reference<br>
 <small>
 [<a class="el" href="group__printer.html">printer</a>]</small>
@@ -13,37 +28,37 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o0">list_parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">list_parameters</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o1">parameters</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#622ce298c6fc93028618fed494c284e9">parameters</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o2">media_size</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#0893788b2db9b714e8185a0d5bc54c65">media_size</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o3">imageable_area</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#d910d40510a98935f74705e1e0c53b6d">imageable_area</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o4">limit</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#6e40367cc4c593d8c68138abdc46e4ef">limit</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o5">print</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#4ba23f8d414bf8d9305fe670b5e7ae94">print</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o6">describe_resolution</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#b11ae31fa8984f09a03acc5d284f53f8">describe_resolution</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o7">describe_output</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#92224ef5b74a148faa0459a1ff6edd6c">describe_output</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o8">verify</a> )(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#7cc301b263aa0c00e3b8d67b79b9949e">verify</a> )(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o9">start_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#fd889d531bf42b215023ed01d74fecab">start_job</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#o10">end_job</a> )(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__printfuncs__t.html#f553a87427ad77ead7b8e6bb7f4a2efa">end_job</a> )(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="o7" args=")(const stp_vars_t *v)" --><p>
+<a class="anchor" name="92224ef5b74a148faa0459a1ff6edd6c"></a><!-- doxytag: member="stp_printfuncs_t::describe_output" ref="92224ef5b74a148faa0459a1ff6edd6c" args=")(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__printfuncs__t.html#o7">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="md" nowrap valign="top">const char*(* <a class="el" href="structstp__printfuncs__t.html#92224ef5b74a148faa0459a1ff6edd6c">stp_printfuncs_t::describe_output</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -60,13 +75,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="o6" args=")(const stp_vars_t *v, int *x, int *y)" --><p>
+<a class="anchor" name="b11ae31fa8984f09a03acc5d284f53f8"></a><!-- doxytag: member="stp_printfuncs_t::describe_resolution" ref="b11ae31fa8984f09a03acc5d284f53f8" args=")(const stp_vars_t *v, int *x, int *y)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o6">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#b11ae31fa8984f09a03acc5d284f53f8">stp_printfuncs_t::describe_resolution</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *x, int *y)          </td>
         </tr>
       </table>
     </td>
@@ -83,13 +98,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="o10" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="f553a87427ad77ead7b8e6bb7f4a2efa"></a><!-- doxytag: member="stp_printfuncs_t::end_job" ref="f553a87427ad77ead7b8e6bb7f4a2efa" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o10">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#f553a87427ad77ead7b8e6bb7f4a2efa">stp_printfuncs_t::end_job</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -106,13 +121,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_printfuncs_t::imageable_area" ref="o3" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
+<a class="anchor" name="d910d40510a98935f74705e1e0c53b6d"></a><!-- doxytag: member="stp_printfuncs_t::imageable_area" ref="d910d40510a98935f74705e1e0c53b6d" args=")(const stp_vars_t *v, int *left, int *right, int *bottom, int *top)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o3">stp_printfuncs_t::imageable_area</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#d910d40510a98935f74705e1e0c53b6d">stp_printfuncs_t::imageable_area</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)          </td>
         </tr>
       </table>
     </td>
@@ -129,13 +144,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="o4" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
+<a class="anchor" name="6e40367cc4c593d8c68138abdc46e4ef"></a><!-- doxytag: member="stp_printfuncs_t::limit" ref="6e40367cc4c593d8c68138abdc46e4ef" args=")(const stp_vars_t *v, int *max_width, int *max_height, int *min_width, int *min_height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o4">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#6e40367cc4c593d8c68138abdc46e4ef">stp_printfuncs_t::limit</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)          </td>
         </tr>
       </table>
     </td>
@@ -152,13 +167,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="o0" args=")(const stp_vars_t *v)" --><p>
+<a class="anchor" name="54879ee9c7f05b72f24bab4bce932970"></a><!-- doxytag: member="stp_printfuncs_t::list_parameters" ref="54879ee9c7f05b72f24bab4bce932970" args=")(const stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>(* <a class="el" href="structstp__printfuncs__t.html#o0">stp_printfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>(* <a class="el" href="structstp__printfuncs__t.html#54879ee9c7f05b72f24bab4bce932970">stp_printfuncs_t::list_parameters</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -175,13 +190,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_printfuncs_t::media_size" ref="o2" args=")(const stp_vars_t *v, int *width, int *height)" --><p>
+<a class="anchor" name="0893788b2db9b714e8185a0d5bc54c65"></a><!-- doxytag: member="stp_printfuncs_t::media_size" ref="0893788b2db9b714e8185a0d5bc54c65" args=")(const stp_vars_t *v, int *width, int *height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o2">stp_printfuncs_t::media_size</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#0893788b2db9b714e8185a0d5bc54c65">stp_printfuncs_t::media_size</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *width, int *height)          </td>
         </tr>
       </table>
     </td>
@@ -198,13 +213,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_printfuncs_t::parameters" ref="o1" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *)" --><p>
+<a class="anchor" name="622ce298c6fc93028618fed494c284e9"></a><!-- doxytag: member="stp_printfuncs_t::parameters" ref="622ce298c6fc93028618fed494c284e9" args=")(const stp_vars_t *v, const char *name, stp_parameter_t *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#o1">stp_printfuncs_t::parameters</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstp__printfuncs__t.html#622ce298c6fc93028618fed494c284e9">stp_printfuncs_t::parameters</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *)          </td>
         </tr>
       </table>
     </td>
@@ -221,13 +236,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="o5" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="4ba23f8d414bf8d9305fe670b5e7ae94"></a><!-- doxytag: member="stp_printfuncs_t::print" ref="4ba23f8d414bf8d9305fe670b5e7ae94" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o5">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#4ba23f8d414bf8d9305fe670b5e7ae94">stp_printfuncs_t::print</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -244,13 +259,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="o9" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
+<a class="anchor" name="fd889d531bf42b215023ed01d74fecab"></a><!-- doxytag: member="stp_printfuncs_t::start_job" ref="fd889d531bf42b215023ed01d74fecab" args=")(const stp_vars_t *v, stp_image_t *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o9">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#fd889d531bf42b215023ed01d74fecab">stp_printfuncs_t::start_job</a>)(const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="structstp__image.html">stp_image_t</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -267,13 +282,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="o8" args=")(stp_vars_t *v)" --><p>
+<a class="anchor" name="7cc301b263aa0c00e3b8d67b79b9949e"></a><!-- doxytag: member="stp_printfuncs_t::verify" ref="7cc301b263aa0c00e3b8d67b79b9949e" args=")(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#o8">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)          </td>
+          <td class="md" nowrap valign="top">int(* <a class="el" href="structstp__printfuncs__t.html#7cc301b263aa0c00e3b8d67b79b9949e">stp_printfuncs_t::verify</a>)(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)          </td>
         </tr>
       </table>
     </td>
@@ -292,8 +307,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="printers_8h.html">printers.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__raw__t.html b/doc/gutenprint/html/structstp__raw__t.html
index fafd743..60c27ba 100644
--- a/doc/gutenprint/html/structstp__raw__t.html
+++ b/doc/gutenprint/html/structstp__raw__t.html
@@ -2,9 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_raw_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_raw_t Struct Reference<br>
 <small>
 [<a class="el" href="group__vars.html">vars</a>]</small>
@@ -15,23 +30,23 @@
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
-<tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#o0">bytes</a></td></tr>
+<tr><td colspan="2"><br><h2>Public Types</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#4b3a6218bb3e3a7303e8a171a60fcf92">bytes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#o1">data</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__raw__t.html#8d777f385d3dfec8815d20f7496026dc">data</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Raw parameter. 
 <p>
-<hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_raw_t::bytes" ref="o0" args="" --><p>
+<hr><h2>Member Typedef Documentation</h2>
+<a class="anchor" name="4b3a6218bb3e3a7303e8a171a60fcf92"></a><!-- doxytag: member="stp_raw_t::bytes" ref="4b3a6218bb3e3a7303e8a171a60fcf92" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">size_t <a class="el" href="structstp__raw__t.html#o0">stp_raw_t::bytes</a>          </td>
+          <td class="md" nowrap valign="top">typedef size_t <a class="el" href="structstp__raw__t.html#4b3a6218bb3e3a7303e8a171a60fcf92">stp_raw_t::bytes</a>          </td>
         </tr>
       </table>
     </td>
@@ -48,13 +63,13 @@ Raw parameter.
 Size of data.     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_raw_t::data" ref="o1" args="" --><p>
+<a class="anchor" name="8d777f385d3dfec8815d20f7496026dc"></a><!-- doxytag: member="stp_raw_t::data" ref="8d777f385d3dfec8815d20f7496026dc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const void* <a class="el" href="structstp__raw__t.html#o1">stp_raw_t::data</a>          </td>
+          <td class="md" nowrap valign="top">typedef const void* <a class="el" href="structstp__raw__t.html#8d777f385d3dfec8815d20f7496026dc">stp_raw_t::data</a>          </td>
         </tr>
       </table>
     </td>
@@ -73,8 +88,8 @@ Raw data.     </td>
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="vars_8h.html">vars.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__shade.html b/doc/gutenprint/html/structstp__shade.html
index 454d5c0..b744a8e 100644
--- a/doc/gutenprint/html/structstp__shade.html
+++ b/doc/gutenprint/html/structstp__shade.html
@@ -2,29 +2,44 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_shade Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_shade Struct Reference</h1><!-- doxytag: class="stp_shade" --><code>#include &lt;dither.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#o0">value</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#2063c1608d6e0baf80249c42e2be5804">value</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#o1">numsizes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#adae9e852b659d0d064b746f5cc85ee4">numsizes</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#o2">dot_sizes</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__shade.html#c4b0221c67b0895782c9c5984cc2578e">dot_sizes</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="o2" args="" --><p>
+<a class="anchor" name="c4b0221c67b0895782c9c5984cc2578e"></a><!-- doxytag: member="stp_shade::dot_sizes" ref="c4b0221c67b0895782c9c5984cc2578e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade.html#o2">stp_shade::dot_sizes</a>          </td>
+          <td class="md" nowrap valign="top">const <a class="el" href="structstp__dotsize.html">stp_dotsize_t</a>* <a class="el" href="structstp__shade.html#c4b0221c67b0895782c9c5984cc2578e">stp_shade::dot_sizes</a>          </td>
         </tr>
       </table>
     </td>
@@ -41,13 +56,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_shade::numsizes" ref="o1" args="" --><p>
+<a class="anchor" name="adae9e852b659d0d064b746f5cc85ee4"></a><!-- doxytag: member="stp_shade::numsizes" ref="adae9e852b659d0d064b746f5cc85ee4" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__shade.html#o1">stp_shade::numsizes</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__shade.html#adae9e852b659d0d064b746f5cc85ee4">stp_shade::numsizes</a>          </td>
         </tr>
       </table>
     </td>
@@ -64,13 +79,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_shade::value" ref="o0" args="" --><p>
+<a class="anchor" name="2063c1608d6e0baf80249c42e2be5804"></a><!-- doxytag: member="stp_shade::value" ref="2063c1608d6e0baf80249c42e2be5804" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="structstp__shade.html#o0">stp_shade::value</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="structstp__shade.html#2063c1608d6e0baf80249c42e2be5804">stp_shade::value</a>          </td>
         </tr>
       </table>
     </td>
@@ -89,8 +104,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="dither_8h.html">dither.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/structstp__weave__t.html b/doc/gutenprint/html/structstp__weave__t.html
index 99e6384..8a3d154 100644
--- a/doc/gutenprint/html/structstp__weave__t.html
+++ b/doc/gutenprint/html/structstp__weave__t.html
@@ -2,37 +2,52 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_weave_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_weave_t Struct Reference</h1><!-- doxytag: class="stp_weave_t" --><code>#include &lt;weave.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o0">row</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#f1965a857bc285d26fe22023aa5ab50d">row</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o1">pass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#1a1dc91c907325c69271ddf0c944bc72">pass</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o2">jet</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#564f60a2dd82ea24bfa3f2f615348f7c">jet</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o3">missingstartrows</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#6b75dc88fe75f396206e0c5862d61543">missingstartrows</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o4">logicalpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#da94ad894675e9119f2c647a94e21605">logicalpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o5">physpassstart</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#13436ac9693968e5601e30fd01451a02">physpassstart</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#o6">physpassend</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__weave__t.html#102875318f07394cc762ba839e0b5231">physpassend</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_weave_t::jet" ref="o2" args="" --><p>
+<a class="anchor" name="564f60a2dd82ea24bfa3f2f615348f7c"></a><!-- doxytag: member="stp_weave_t::jet" ref="564f60a2dd82ea24bfa3f2f615348f7c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o2">stp_weave_t::jet</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#564f60a2dd82ea24bfa3f2f615348f7c">stp_weave_t::jet</a>          </td>
         </tr>
       </table>
     </td>
@@ -49,13 +64,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="o4" args="" --><p>
+<a class="anchor" name="da94ad894675e9119f2c647a94e21605"></a><!-- doxytag: member="stp_weave_t::logicalpassstart" ref="da94ad894675e9119f2c647a94e21605" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o4">stp_weave_t::logicalpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#da94ad894675e9119f2c647a94e21605">stp_weave_t::logicalpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -72,13 +87,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="o3" args="" --><p>
+<a class="anchor" name="6b75dc88fe75f396206e0c5862d61543"></a><!-- doxytag: member="stp_weave_t::missingstartrows" ref="6b75dc88fe75f396206e0c5862d61543" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o3">stp_weave_t::missingstartrows</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#6b75dc88fe75f396206e0c5862d61543">stp_weave_t::missingstartrows</a>          </td>
         </tr>
       </table>
     </td>
@@ -95,13 +110,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_weave_t::pass" ref="o1" args="" --><p>
+<a class="anchor" name="1a1dc91c907325c69271ddf0c944bc72"></a><!-- doxytag: member="stp_weave_t::pass" ref="1a1dc91c907325c69271ddf0c944bc72" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o1">stp_weave_t::pass</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#1a1dc91c907325c69271ddf0c944bc72">stp_weave_t::pass</a>          </td>
         </tr>
       </table>
     </td>
@@ -118,13 +133,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="o6" args="" --><p>
+<a class="anchor" name="102875318f07394cc762ba839e0b5231"></a><!-- doxytag: member="stp_weave_t::physpassend" ref="102875318f07394cc762ba839e0b5231" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o6">stp_weave_t::physpassend</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#102875318f07394cc762ba839e0b5231">stp_weave_t::physpassend</a>          </td>
         </tr>
       </table>
     </td>
@@ -141,13 +156,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="o5" args="" --><p>
+<a class="anchor" name="13436ac9693968e5601e30fd01451a02"></a><!-- doxytag: member="stp_weave_t::physpassstart" ref="13436ac9693968e5601e30fd01451a02" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o5">stp_weave_t::physpassstart</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#13436ac9693968e5601e30fd01451a02">stp_weave_t::physpassstart</a>          </td>
         </tr>
       </table>
     </td>
@@ -164,13 +179,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_weave_t::row" ref="o0" args="" --><p>
+<a class="anchor" name="f1965a857bc285d26fe22023aa5ab50d"></a><!-- doxytag: member="stp_weave_t::row" ref="f1965a857bc285d26fe22023aa5ab50d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#o0">stp_weave_t::row</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstp__weave__t.html#f1965a857bc285d26fe22023aa5ab50d">stp_weave_t::row</a>          </td>
         </tr>
       </table>
     </td>
@@ -189,8 +204,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="weave_8h.html">weave.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/tab_b.gif b/doc/gutenprint/html/tab_b.gif
new file mode 100644
index 0000000..0d62348
--- /dev/null
+++ b/doc/gutenprint/html/tab_b.gif
diff --git a/doc/gutenprint/html/tab_l.gif b/doc/gutenprint/html/tab_l.gif
new file mode 100644
index 0000000..9b1e633
--- /dev/null
+++ b/doc/gutenprint/html/tab_l.gif
diff --git a/doc/gutenprint/html/tab_r.gif b/doc/gutenprint/html/tab_r.gif
new file mode 100644
index 0000000..ce9dd9f
--- /dev/null
+++ b/doc/gutenprint/html/tab_r.gif
diff --git a/doc/gutenprint/html/tabs.css b/doc/gutenprint/html/tabs.css
new file mode 100644
index 0000000..a61552a
--- /dev/null
+++ b/doc/gutenprint/html/tabs.css
@@ -0,0 +1,102 @@
+/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
+
+DIV.tabs
+{
+   float            : left;
+   width            : 100%;
+   background       : url("tab_b.gif") repeat-x bottom;
+   margin-bottom    : 4px;
+}
+
+DIV.tabs UL
+{
+   margin           : 0px;
+   padding-left     : 10px;
+   list-style       : none;
+}
+
+DIV.tabs LI, DIV.tabs FORM
+{
+   display          : inline;
+   margin           : 0px;
+   padding          : 0px;
+}
+
+DIV.tabs FORM
+{
+   float            : right;
+}
+
+DIV.tabs A
+{
+   float            : left;
+   background       : url("tab_r.gif") no-repeat right top;
+   border-bottom    : 1px solid #84B0C7;
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+DIV.tabs A:hover
+{
+   background-position: 100% -150px;
+}
+
+DIV.tabs A:link, DIV.tabs A:visited,
+DIV.tabs A:active, DIV.tabs A:hover
+{
+       color: #1A419D;
+}
+
+DIV.tabs SPAN
+{
+   float            : left;
+   display          : block;
+   background       : url("tab_l.gif") no-repeat left top;
+   padding          : 5px 9px;
+   white-space      : nowrap;
+}
+
+DIV.tabs INPUT
+{
+   float            : right;
+   display          : inline;
+   font-size        : 1em;
+}
+
+DIV.tabs TD
+{
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+DIV.tabs SPAN {float : none;}
+/* End IE5-Mac hack */
+
+DIV.tabs A:hover SPAN
+{
+   background-position: 0% -150px;
+}
+
+DIV.tabs LI#current A
+{
+   background-position: 100% -150px;
+   border-width     : 0px;
+}
+
+DIV.tabs LI#current SPAN
+{
+   background-position: 0% -150px;
+   padding-bottom   : 6px;
+}
+
+DIV.nav
+{
+   background       : none;
+   border           : none;
+   border-bottom    : 1px solid #84B0C7;
+}
diff --git a/doc/gutenprint/html/unionstp__mxml__value__u.html b/doc/gutenprint/html/unionstp__mxml__value__u.html
index 94b53b7..eeea931 100644
--- a/doc/gutenprint/html/unionstp__mxml__value__u.html
+++ b/doc/gutenprint/html/unionstp__mxml__value__u.html
@@ -2,33 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: stp_mxml_value_u Union Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stp_mxml_value_u Union Reference</h1><!-- doxytag: class="stp_mxml_value_u" --><code>#include &lt;mxml.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o0">element</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#8e2dcfd7e7e24b1ca76c1193f645902b">element</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o1">integer</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#157db7df530023575515d366c9b672e8">integer</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o2">opaque</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#94619f8a70068b2591c2eed622525b0e">opaque</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o3">real</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#4bca24304861acde5770fdbe3cc2503b">real</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#o4">text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="unionstp__mxml__value__u.html#1cb251ec0d568de6a929b520c4aed8d1">text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="o0" args="" --><p>
+<a class="anchor" name="8e2dcfd7e7e24b1ca76c1193f645902b"></a><!-- doxytag: member="stp_mxml_value_u::element" ref="8e2dcfd7e7e24b1ca76c1193f645902b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__u.html#o0">stp_mxml_value_u::element</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__value__s.html">stp_mxml_element_t</a> <a class="el" href="unionstp__mxml__value__u.html#8e2dcfd7e7e24b1ca76c1193f645902b">stp_mxml_value_u::element</a>          </td>
         </tr>
       </table>
     </td>
@@ -45,13 +60,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="o1" args="" --><p>
+<a class="anchor" name="157db7df530023575515d366c9b672e8"></a><!-- doxytag: member="stp_mxml_value_u::integer" ref="157db7df530023575515d366c9b672e8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="unionstp__mxml__value__u.html#o1">stp_mxml_value_u::integer</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="unionstp__mxml__value__u.html#157db7df530023575515d366c9b672e8">stp_mxml_value_u::integer</a>          </td>
         </tr>
       </table>
     </td>
@@ -68,13 +83,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="o2" args="" --><p>
+<a class="anchor" name="94619f8a70068b2591c2eed622525b0e"></a><!-- doxytag: member="stp_mxml_value_u::opaque" ref="94619f8a70068b2591c2eed622525b0e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="unionstp__mxml__value__u.html#o2">stp_mxml_value_u::opaque</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="unionstp__mxml__value__u.html#94619f8a70068b2591c2eed622525b0e">stp_mxml_value_u::opaque</a>          </td>
         </tr>
       </table>
     </td>
@@ -91,13 +106,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="o3" args="" --><p>
+<a class="anchor" name="4bca24304861acde5770fdbe3cc2503b"></a><!-- doxytag: member="stp_mxml_value_u::real" ref="4bca24304861acde5770fdbe3cc2503b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">double <a class="el" href="unionstp__mxml__value__u.html#o3">stp_mxml_value_u::real</a>          </td>
+          <td class="md" nowrap valign="top">double <a class="el" href="unionstp__mxml__value__u.html#4bca24304861acde5770fdbe3cc2503b">stp_mxml_value_u::real</a>          </td>
         </tr>
       </table>
     </td>
@@ -114,13 +129,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="o4" args="" --><p>
+<a class="anchor" name="1cb251ec0d568de6a929b520c4aed8d1"></a><!-- doxytag: member="stp_mxml_value_u::text" ref="1cb251ec0d568de6a929b520c4aed8d1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__u.html#o4">stp_mxml_value_u::text</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__text__s.html">stp_mxml_text_t</a> <a class="el" href="unionstp__mxml__value__u.html#1cb251ec0d568de6a929b520c4aed8d1">stp_mxml_value_u::text</a>          </td>
         </tr>
       </table>
     </td>
@@ -139,8 +154,8 @@
 </table>
 <hr>The documentation for this union was generated from the following file:<ul>
 <li>include/gutenprint/<a class="el" href="mxml_8h.html">mxml.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/util_8h.html b/doc/gutenprint/html/util_8h.html
index b628861..4852989 100644
--- a/doc/gutenprint/html/util_8h.html
+++ b/doc/gutenprint/html/util_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/util.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>util.h File Reference</h1>Utility functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprint/curve.h</a>&gt;</code><br>
@@ -14,127 +28,127 @@
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga33">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9ef88b326f83d342849fa89c33c7e4a7">STP_DBG_LUT</a>&nbsp;&nbsp;&nbsp;0x1</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga34">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3560e33ba80d2a0ceb07fe51fac845be">STP_DBG_COLORFUNC</a>&nbsp;&nbsp;&nbsp;0x2</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga35">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g328a4b66d0767134649ce30b243931c9">STP_DBG_INK</a>&nbsp;&nbsp;&nbsp;0x4</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga36">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g8d8211f97675b37f18bff822757d04b3">STP_DBG_PS</a>&nbsp;&nbsp;&nbsp;0x8</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga37">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g30a9efd31b78debefd550d0b337ec795">STP_DBG_PCL</a>&nbsp;&nbsp;&nbsp;0x10</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga38">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g158e1ea4acff071440681ba678b6fb0b">STP_DBG_ESCP2</a>&nbsp;&nbsp;&nbsp;0x20</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga39">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0d6b1a8d780b3c5f970454678bc0323">STP_DBG_CANON</a>&nbsp;&nbsp;&nbsp;0x40</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga40">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb8180ab505c2d7c5a717a53096ac770c">STP_DBG_LEXMARK</a>&nbsp;&nbsp;&nbsp;0x80</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga41">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc746369f247dc346bcbdeacb1abbdbcb">STP_DBG_WEAVE_PARAMS</a>&nbsp;&nbsp;&nbsp;0x100</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga42">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb764d477ebf0db4957cc316badac70bd">STP_DBG_ROWS</a>&nbsp;&nbsp;&nbsp;0x200</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga43">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9c8f6255efb1fcf9cd3e7a68466e44ba">STP_DBG_MARK_FILE</a>&nbsp;&nbsp;&nbsp;0x400</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga44">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gcb3d85de1088cf795cfeaa9e1450c4e0">STP_DBG_LIST</a>&nbsp;&nbsp;&nbsp;0x800</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga45">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6d69d079a3d7a3e0e2b870e1e9417187">STP_DBG_MODULE</a>&nbsp;&nbsp;&nbsp;0x1000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga46">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gb11ef5f0ed150be2d3b999b7fc7e4f24">STP_DBG_PATH</a>&nbsp;&nbsp;&nbsp;0x2000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga47">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g08f48f3423e848f1932435c5f8e94ff7">STP_DBG_PAPER</a>&nbsp;&nbsp;&nbsp;0x4000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga48">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7bbbf3d31a1a4f6b0da808184e1c1587">STP_DBG_PRINTERS</a>&nbsp;&nbsp;&nbsp;0x8000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga49">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g51aee81a3d2a33d42417f6b61bb63f5e">STP_DBG_XML</a>&nbsp;&nbsp;&nbsp;0x10000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga50">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g52844a51058ca29f975b5666743622ac">STP_DBG_VARS</a>&nbsp;&nbsp;&nbsp;0x20000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga51">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g4dc6609c9bb0c256fec7361f41a5c45f">STP_DBG_OLYMPUS</a>&nbsp;&nbsp;&nbsp;0x40000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga52">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9eaf8d50f127cd4316bf68ad34092551">STP_DBG_CURVE</a>&nbsp;&nbsp;&nbsp;0x80000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga53">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gc80b8553e636ec01fe4e975d9f7668b9">STP_DBG_CURVE_ERRORS</a>&nbsp;&nbsp;&nbsp;0x100000</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga54">STP_SAFE_FREE</a>(x)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g44a234fbf1ab832399fc674c8cb53b1f">STP_SAFE_FREE</a>(x)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga0">stp_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g69354e5830712093045a4ba290a298f8">stp_init</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="group__util.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga1">stp_set_output_codeset</a> (const char *codeset)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Initialise libgimpprint.  <a href="group__util.html#g69354e5830712093045a4ba290a298f8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf7978ce9e414b3d8ad905ee36a51cfbd">stp_set_output_codeset</a> (const char *codeset)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="group__util.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga2">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#ga49">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output encoding.  <a href="group__util.html#gf7978ce9e414b3d8ad905ee36a51cfbd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g21168356d466d278f11dab2be8d0016e">stp_read_and_compose_curves</a> (const char *s1, const char *s2, <a class="el" href="group__curve.html#gb7d718baf4619b6be6c4aff8ce84aad9">stp_curve_compose_t</a> comp, size_t piecewise_point_count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga3">stp_abort</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9b6b2745ee2d68d1ca356a79c50f0ed7">stp_abort</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga4">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf64336e7c536a51d0debe88f1f5ec90a">stp_prune_inactive_options</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga5">stp_zprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g18aaa3874e4dd5259a4d182fa8d9c90a">stp_zprintf</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga6">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9135d4c8cac78593aff55b668d09b79c">stp_zfwrite</a> (const char *buf, size_t bytes, size_t nitems, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga7">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf07e31a63021b4d504cc5a410e1aeb08">stp_putc</a> (int ch, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga8">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g01199dc1d5a3db973d22cc9db00a4f41">stp_put16_le</a> (unsigned short sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga9">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g3c20beae37d9841e095b336d6f7dcc1d">stp_put16_be</a> (unsigned short sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga10">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g0a445c531388afa31650ef4ccdac3ae1">stp_put32_le</a> (unsigned int sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga11">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gbe0e31fbc0c4e6374903b25edc594f5e">stp_put32_be</a> (unsigned int sh, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga12">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g0a59761c8a4ee5f31cfb9bec2a9b00b4">stp_puts</a> (const char *s, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga13">stp_send_command</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g23ee64de1ec6ef5a4941ab80ba609840">stp_send_command</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *command, const char *format,...)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga14">stp_erputc</a> (int ch)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g859b75eddde620338859121451096097">stp_erputc</a> (int ch)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga15">stp_eprintf</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g47c73485971132d9b41a33bdf572f670">stp_eprintf</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga16">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g5f6389ed7d500f851cabe8425a158e4b">stp_erprintf</a> (const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga17">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g6bdd7099220fe310b228dcff5159b8d9">stp_asprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga18">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g34d3ebda7c5b75ab40d1600f4d79a4be">stp_catprintf</a> (char **strp, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga19">stp_get_debug_level</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g9ab4c35dd4b6e142281ff36ecedee27e">stp_get_debug_level</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga20">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g24e214e32810cc67c493c270a6ad83d6">stp_dprintf</a> (unsigned long level, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga21">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf7bc1bd0ff92ca0f6ba7d0eb559e1da3">stp_deprintf</a> (unsigned long level, const char *format,...) __attribute__((format(__printf__</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga22">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void void void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g26a43ceec27ca34bc49f4806900b4618">stp_init_debug_messages</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga23">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gf39c22b74843750ca74a6caccb263c7c">stp_flush_debug_messages</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga24">stp_malloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g7c76d059684ee6dc5bdc06e4b3af18ef">stp_malloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga25">stp_zalloc</a> (size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gae1d98650ef9777ae4f4b10eae60b5c9">stp_zalloc</a> (size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga26">stp_realloc</a> (void *ptr, size_t)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g908f11aeabf31c8a9621bd65d408a5fc">stp_realloc</a> (void *ptr, size_t)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga27">stp_free</a> (void *ptr)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#gabf89ff6213b9dc568fbdd1342b663ad">stp_free</a> (void *ptr)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga28">stp_strlen</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g054943d301baecba82cdb78b7e454880">stp_strlen</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga29">stp_strndup</a> (const char *s, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2c6b28a35780bfa7d03a2f8381ee82c2">stp_strndup</a> (const char *s, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga30">stp_strdup</a> (const char *s)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g2f861f4a98ad496ca8cd995147867f32">stp_strdup</a> (const char *s)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga31">stp_get_version</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#g77022a2cfde3a9ba9269f1bc3726175c">stp_get_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="group__util.html#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ga32">stp_get_release_version</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library version string (x.y.z).  <a href="group__util.html#g77022a2cfde3a9ba9269f1bc3726175c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__util.html#ged2a65d98cba1fd6d48c0cc1b611ae0f">stp_get_release_version</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="group__util.html#ga32"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the library release version string (x.y).  <a href="group__util.html#ged2a65d98cba1fd6d48c0cc1b611ae0f"></a><br></td></tr>
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Utility functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/vars_8h.html b/doc/gutenprint/html/vars_8h.html
index 5586ea2..7ab6499 100644
--- a/doc/gutenprint/html/vars_8h.html
+++ b/doc/gutenprint/html/vars_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/vars.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>vars.h File Reference</h1>Print job functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="array_8h.html">gutenprint/array.h</a>&gt;</code><br>
@@ -28,450 +42,450 @@
 
 <tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter description.  <a href="structstp__parameter__t.html#_details">More...</a><br></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga0">stp_vars_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_vars&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="group__vars.html#ga0"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The vars opaque data type.  <a href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="group__vars.html#ga1"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The parameter_list opaque data type.  <a href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef const void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="group__vars.html#ga2"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">The constant parameter_list opaque data type.  <a href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> )(void *data, const char *buffer, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#ga3"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> )(void *)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Output function supplied by the calling application.  <a href="group__vars.html#gd11be815334025415a8e2023e0cd44c5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a> )(void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> )(void *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a> )(void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga6">compdata_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef stp_compdata&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9ee295029ad2d072b4099dc390359900">compdata_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga132">stp_parameter_type_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a7">STP_PARAMETER_TYPE_STRING_LIST</a>, 
-<a class="el" href="group__vars.html#gga132a8">STP_PARAMETER_TYPE_INT</a>, 
-<a class="el" href="group__vars.html#gga132a9">STP_PARAMETER_TYPE_BOOLEAN</a>, 
-<a class="el" href="group__vars.html#gga132a10">STP_PARAMETER_TYPE_DOUBLE</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">stp_parameter_type_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5b847aa58c9a3d8e566661a34d7a028e2">STP_PARAMETER_TYPE_STRING_LIST</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5268a4644b90300becf65fa9346217bc4">STP_PARAMETER_TYPE_INT</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e503caf4b1f5e3267dc0a3a2de63ffa70d">STP_PARAMETER_TYPE_BOOLEAN</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51fa41224c9e89cbf2155edf5ba606f81">STP_PARAMETER_TYPE_DOUBLE</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a11">STP_PARAMETER_TYPE_CURVE</a>, 
-<a class="el" href="group__vars.html#gga132a12">STP_PARAMETER_TYPE_FILE</a>, 
-<a class="el" href="group__vars.html#gga132a13">STP_PARAMETER_TYPE_RAW</a>, 
-<a class="el" href="group__vars.html#gga132a14">STP_PARAMETER_TYPE_ARRAY</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5a8d435cfddfe398993604635c58c528e">STP_PARAMETER_TYPE_CURVE</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e5748c8e369d881d8b32da729765d2f8e6">STP_PARAMETER_TYPE_FILE</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e53e5ed8844c4437146c835bed218b0372">STP_PARAMETER_TYPE_RAW</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e55b5ff2e4fed99255ad14618ef216269d">STP_PARAMETER_TYPE_ARRAY</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga132a15">STP_PARAMETER_TYPE_DIMENSION</a>, 
-<a class="el" href="group__vars.html#gga132a16">STP_PARAMETER_TYPE_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e594a909fcb60c8c45dcff08828b18dac7">STP_PARAMETER_TYPE_DIMENSION</a>, 
+<a class="el" href="group__vars.html#gge031ab2c7ff60007e284ed71a73111e51a46050a805e19458b0eda9064a7c576">STP_PARAMETER_TYPE_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ga132">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga133">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gga133a17">STP_PARAMETER_CLASS_FEATURE</a>, 
-<a class="el" href="group__vars.html#gga133a18">STP_PARAMETER_CLASS_OUTPUT</a>, 
-<a class="el" href="group__vars.html#gga133a19">STP_PARAMETER_CLASS_CORE</a>, 
-<a class="el" href="group__vars.html#gga133a20">STP_PARAMETER_CLASS_INVALID</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter types.  <a href="group__vars.html#ge031ab2c7ff60007e284ed71a73111e5">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">stp_parameter_class_t</a> { <a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e99d2c770b8aa6b7eae85c804266265d11">STP_PARAMETER_CLASS_FEATURE</a>, 
+<a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e954c5d9de522729285a3fc4e53b7e720a">STP_PARAMETER_CLASS_OUTPUT</a>, 
+<a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9443889036b4867982d9c3bc6c0602ba9">STP_PARAMETER_CLASS_CORE</a>, 
+<a class="el" href="group__vars.html#gg13c0565b3039fa25fd77092a578d44e9bb4064bdb2681d0676c260f92debe606">STP_PARAMETER_CLASS_INVALID</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#ga133">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga134">stp_parameter_level_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a21">STP_PARAMETER_LEVEL_BASIC</a>, 
-<a class="el" href="group__vars.html#gga134a22">STP_PARAMETER_LEVEL_ADVANCED</a>, 
-<a class="el" href="group__vars.html#gga134a23">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
-<a class="el" href="group__vars.html#gga134a24">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter class.  <a href="group__vars.html#g13c0565b3039fa25fd77092a578d44e9">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">stp_parameter_level_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06d4b10b4cbe34da0d50ef1c719211ca">STP_PARAMETER_LEVEL_BASIC</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebecf41991a73953adcd3bc8d66d1db24dc">STP_PARAMETER_LEVEL_ADVANCED</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe06b99c8e993bbc9c936066ef0ac469fc">STP_PARAMETER_LEVEL_ADVANCED1</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe454d382a02ed35cbecc6b864f86a6ce8">STP_PARAMETER_LEVEL_ADVANCED2</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a25">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
-<a class="el" href="group__vars.html#gga134a26">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
-<a class="el" href="group__vars.html#gga134a27">STP_PARAMETER_LEVEL_INTERNAL</a>, 
-<a class="el" href="group__vars.html#gga134a28">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe0439ffae733c36fb495ece07f093365c">STP_PARAMETER_LEVEL_ADVANCED3</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebeaa9281ce5361bc18122e9a894f6fdfff">STP_PARAMETER_LEVEL_ADVANCED4</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebec2af29bb68f43694ce7fa3b1e79c19dd">STP_PARAMETER_LEVEL_INTERNAL</a>, 
+<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe226fdf510a07878674e5bc6e89bb4203">STP_PARAMETER_LEVEL_EXTERNAL</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="group__vars.html#gga134a29">STP_PARAMETER_LEVEL_INVALID</a>
+&nbsp;&nbsp;<a class="el" href="group__vars.html#ggaa13470b0a857e96dbe70882b3fb8ebe6e6e7736a5abbef473b3b8351b2e06a3">STP_PARAMETER_LEVEL_INVALID</a>
 <br>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#ga134">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#gga135a30">STP_PARAMETER_INACTIVE</a>, 
-<a class="el" href="group__vars.html#gga135a31">STP_PARAMETER_DEFAULTED</a>, 
-<a class="el" href="group__vars.html#gga135a32">STP_PARAMETER_ACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter level.  <a href="group__vars.html#gaa13470b0a857e96dbe70882b3fb8ebe">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> { <a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53351447d832ab2594f7b92e763be09bab">STP_PARAMETER_INACTIVE</a>, 
+<a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb53674647f5872c444ad04b80feef7ed136">STP_PARAMETER_DEFAULTED</a>, 
+<a class="el" href="group__vars.html#ggb11c7af74fa0595684377cafe4d4eb536c776549d871910c649b6eee3f2cbc99">STP_PARAMETER_ACTIVE</a>
  }</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#ga135">More...</a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gga136a33">PARAMETER_BAD</a>, 
-<a class="el" href="group__vars.html#gga136a34">PARAMETER_OK</a>, 
-<a class="el" href="group__vars.html#gga136a35">PARAMETER_INACTIVE</a>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Parameter activity.  <a href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">More...</a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a> { <a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35168dec748149f8de0a0c901b55fa7bda25">PARAMETER_BAD</a>, 
+<a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf35167a33203745369abab16ecb3d95450333">PARAMETER_OK</a>, 
+<a class="el" href="group__vars.html#gg1d02c21b8f025b121dd340db9adf3516687523dd969d55c3db9da70dd563b1e9">PARAMETER_INACTIVE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga7">stp_vars_create</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a">stp_vars_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="group__vars.html#ga7"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8">stp_vars_copy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a new vars object.  <a href="group__vars.html#gae35d353b6f86b1cbb97bb0b271f5c9a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g165ae58fed1515b5466ab1b84df85a86">stp_vars_copy</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *dest, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="group__vars.html#ga8"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga9">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *source)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy a vars object.  <a href="group__vars.html#g165ae58fed1515b5466ab1b84df85a86"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c6d765cc5a27b322289e9baa9d97098">stp_vars_create_copy</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *source)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="group__vars.html#ga9"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga10">stp_vars_destroy</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a vars object.  <a href="group__vars.html#g3c6d765cc5a27b322289e9baa9d97098"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g78259fcaa881655a07ef0b2b457bdf70">stp_vars_destroy</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="group__vars.html#ga10"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga11">stp_set_driver</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a vars object.  <a href="group__vars.html#g78259fcaa881655a07ef0b2b457bdf70"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8d9dbb1e613cfe2b119668158e35a76">stp_set_driver</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga11"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga12">stp_set_driver_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga8d9dbb1e613cfe2b119668158e35a76"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge303a6ed77135b691ebbfd56cb577531">stp_set_driver_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ga12"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga13">stp_get_driver</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the printer driver.  <a href="group__vars.html#ge303a6ed77135b691ebbfd56cb577531"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcf8efdb6fd9847e41c85f9491a252f01">stp_get_driver</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="group__vars.html#ga13"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga14">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the printer driver.  <a href="group__vars.html#gcf8efdb6fd9847e41c85f9491a252f01"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g335e7eb264fa22343765146fb2318b31">stp_set_color_conversion</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga14"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga15">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#g335e7eb264fa22343765146fb2318b31"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3164aa99994dabb561d6c295eb647123">stp_set_color_conversion_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *val, int bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#ga15"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga16">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the name of the color conversion routine, if not the default.  <a href="group__vars.html#g3164aa99994dabb561d6c295eb647123"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g087136342c500c138d73dbe0e2aad11a">stp_get_color_conversion</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="group__vars.html#ga16"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga17">stp_set_left</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the name of the color conversion routine.  <a href="group__vars.html#g087136342c500c138d73dbe0e2aad11a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5d675ab9877df60ec467a20a0d62fcbc">stp_set_left</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="group__vars.html#ga17"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga18">stp_get_left</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the left edge of the image.  <a href="group__vars.html#g5d675ab9877df60ec467a20a0d62fcbc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd3fbd778898c2b0fba19d0937fb939f5">stp_get_left</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="group__vars.html#ga18"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga19">stp_set_top</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the left edge of the image.  <a href="group__vars.html#gd3fbd778898c2b0fba19d0937fb939f5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gaa76e04fcde3aa6c162fb9d2fcaca251">stp_set_top</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="group__vars.html#ga19"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga20">stp_get_top</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the top edge of the image.  <a href="group__vars.html#gaa76e04fcde3aa6c162fb9d2fcaca251"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcda38fc8e26a75c2b5d246b4341a8fd3">stp_get_top</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="group__vars.html#ga20"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga21">stp_set_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the top edge of the image.  <a href="group__vars.html#gcda38fc8e26a75c2b5d246b4341a8fd3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdbdd8bad1742e87b5c5a299c2ebf7cf4">stp_set_width</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="group__vars.html#ga21"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga22">stp_get_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the width of the image.  <a href="group__vars.html#gdbdd8bad1742e87b5c5a299c2ebf7cf4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1">stp_get_width</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="group__vars.html#ga22"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga23">stp_set_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the width edge of the image.  <a href="group__vars.html#g22cd2dcf85d7cf6d3f7f0aa79b6dcdf1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g68110f6d19b3987f6f66baee3926eb89">stp_set_height</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="group__vars.html#ga23"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga24">stp_get_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the height of the image.  <a href="group__vars.html#g68110f6d19b3987f6f66baee3926eb89"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7623276e130cb684670ecb153300ebaf">stp_get_height</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="group__vars.html#ga24"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga25">stp_set_page_width</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the height of the image.  <a href="group__vars.html#g7623276e130cb684670ecb153300ebaf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g751759cdeb8feb061c00f35d37fea45c">stp_set_page_width</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="group__vars.html#ga25"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga26">stp_get_page_width</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page width.  <a href="group__vars.html#g751759cdeb8feb061c00f35d37fea45c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gea14f3cad139fc5b8d547a252deacff3">stp_get_page_width</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="group__vars.html#ga26"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga27">stp_set_page_height</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page width.  <a href="group__vars.html#gea14f3cad139fc5b8d547a252deacff3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g775714bf75f1fdbdd895f59edc9eca55">stp_set_page_height</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="group__vars.html#ga27"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga28">stp_get_page_height</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the page height.  <a href="group__vars.html#g775714bf75f1fdbdd895f59edc9eca55"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g94d8cf912e3b036f67bc2d4c37d733ff">stp_get_page_height</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="group__vars.html#ga28"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga29">stp_set_outfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the page height.  <a href="group__vars.html#g94d8cf912e3b036f67bc2d4c37d733ff"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g30d5438686c8ead9a092f98bf3c3d8ca">stp_set_outfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="group__vars.html#ga29"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga30">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print output information.  <a href="group__vars.html#g30d5438686c8ead9a092f98bf3c3d8ca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g095834813ebbe8985d443e1fa78a0b98">stp_get_outfunc</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga30"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga31">stp_set_errfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, <a class="el" href="group__vars.html#ga3">stp_outfunc_t</a> val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#g095834813ebbe8985d443e1fa78a0b98"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge89d8eb48e4a7a8107b87a44a4318064">stp_set_errfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, <a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a> val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="group__vars.html#ga31"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga3">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga32">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the function used to print error and diagnostic information.  <a href="group__vars.html#ge89d8eb48e4a7a8107b87a44a4318064"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gd11be815334025415a8e2023e0cd44c5">stp_outfunc_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fe5b4efdfaa3e79918dd5079e61e2c5">stp_get_errfunc</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#ga32"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga33">stp_set_outdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the function used to print output information.  <a href="group__vars.html#g9fe5b4efdfaa3e79918dd5079e61e2c5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8fef23ae01a368f4d16ad95813d97d6d">stp_set_outdata</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="group__vars.html#ga33"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga34">stp_get_outdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the output data.  <a href="group__vars.html#g8fef23ae01a368f4d16ad95813d97d6d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g54e35f94578f346c07718587f18b049c">stp_get_outdata</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="group__vars.html#ga34"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga35">stp_set_errdata</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, void *val)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the output data.  <a href="group__vars.html#g54e35f94578f346c07718587f18b049c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7a006418c4dbb265be71f7b5a202455d">stp_set_errdata</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, void *val)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="group__vars.html#ga35"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga36">stp_get_errdata</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the error data.  <a href="group__vars.html#g7a006418c4dbb265be71f7b5a202455d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge66b9c64f5821ee6e95f4b9e18cadd4e">stp_get_errdata</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="group__vars.html#ga36"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga37">stp_merge_printvars</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *print)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the error data.  <a href="group__vars.html#ge66b9c64f5821ee6e95f4b9e18cadd4e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc970fc314c6418d9193d93c787b908d9">stp_merge_printvars</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *user, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *print)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="group__vars.html#ga37"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga38">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Merge defaults for a printer with user-chosen settings.  <a href="group__vars.html#gc970fc314c6418d9193d93c787b908d9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g955b215a88b868cfc74d7a340de9b8f6">stp_get_parameter_list</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="group__vars.html#ga38"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga39">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the available parameters for the currently chosen settings.  <a href="group__vars.html#g955b215a88b868cfc74d7a340de9b8f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">size_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf69f651a798e9f06c67baf06f0754228">stp_parameter_list_count</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="group__vars.html#ga39"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga40">stp_parameter_find</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">List the number of available parameters for the currently chosen settings.  <a href="group__vars.html#gf69f651a798e9f06c67baf06f0754228"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3dea1f995d40482b9f6470fedd994f95">stp_parameter_find</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="group__vars.html#ga40"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga41">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name.  <a href="group__vars.html#g3dea1f995d40482b9f6470fedd994f95"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g96fc73864dfc00ae418f14a81c72be26">stp_parameter_list_param</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list, size_t item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="group__vars.html#ga41"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga42">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its index number.  <a href="group__vars.html#g96fc73864dfc00ae418f14a81c72be26"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd0f6c2b153638f551d7709780eb7276a">stp_parameter_list_destroy</a> (<a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="group__vars.html#ga42"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga43">stp_parameter_list_create</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter_list.  <a href="group__vars.html#gd0f6c2b153638f551d7709780eb7276a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g3c1ddd3c10c367c0912fdd841576278f">stp_parameter_list_create</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="group__vars.html#ga43"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga44">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Create a parameter_list.  <a href="group__vars.html#g3c1ddd3c10c367c0912fdd841576278f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga8dc4ff543dbc1882d673b25234088b6">stp_parameter_list_add_param</a> (<a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> list, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *item)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="group__vars.html#ga44"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga45">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> list)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Add a parameter to a parameter_list.  <a href="group__vars.html#ga8dc4ff543dbc1882d673b25234088b6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g62c6225b0721d5c80d889edc307f0b6b">stp_parameter_list_copy</a> (<a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> list)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="group__vars.html#ga45"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga46">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#ga1">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#ga2">stp_const_parameter_list_t</a> append)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Copy and allocate a parameter_list.  <a href="group__vars.html#g62c6225b0721d5c80d889edc307f0b6b"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf8aa1d7aba11de5fdee95b9cb339be61">stp_parameter_list_append</a> (<a class="el" href="group__vars.html#gb264246d4b7e584447b5f39ed8f7ee05">stp_parameter_list_t</a> list, <a class="el" href="group__vars.html#g73ac4d52cb5cecbb9694e9038fb7ea82">stp_const_parameter_list_t</a> append)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="group__vars.html#ga46"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga47">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Append one parameter_list to another.  <a href="group__vars.html#gf8aa1d7aba11de5fdee95b9cb339be61"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ged453c314365a3948b195e3175455a12">stp_describe_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="group__vars.html#ga47"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga48">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Describe a parameter in detail.  <a href="group__vars.html#ged453c314365a3948b195e3175455a12"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc5a3eb0348d31acf60772265c3896542">stp_parameter_description_destroy</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *description)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="group__vars.html#ga48"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga49">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Destroy a parameter description.  <a href="group__vars.html#gc5a3eb0348d31acf60772265c3896542"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g711cf3e5e52fd3434ef7a9d16654aea8">stp_parameter_find_in_settings</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="group__vars.html#ga49"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga50">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Find a parameter by its name from a vars object.  <a href="group__vars.html#g711cf3e5e52fd3434ef7a9d16654aea8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g22338d64a871a8b279fdee6fd83fff7f">stp_set_string_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#ga50"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga51">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#g22338d64a871a8b279fdee6fd83fff7f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5182246d4e0653f73dfaa40b62d4285f">stp_set_string_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#ga51"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga52">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a string parameter.  <a href="group__vars.html#g5182246d4e0653f73dfaa40b62d4285f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8134e4dc36b063a7d7dd229b9df32726">stp_set_file_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga52"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga53">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#g8134e4dc36b063a7d7dd229b9df32726"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6e6c5474c253a452073eba25251a1481">stp_set_file_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#ga53"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga54">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a file parameter.  <a href="group__vars.html#g6e6c5474c253a452073eba25251a1481"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g82f7bbcf639c60678c1dc2aee24e8a24">stp_set_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="group__vars.html#ga54"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga55">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a float parameter.  <a href="group__vars.html#g82f7bbcf639c60678c1dc2aee24e8a24"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8c6cd5f3bb3ab59a4f06c020c062c13e">stp_set_int_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="group__vars.html#ga55"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga56">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an integer parameter.  <a href="group__vars.html#g8c6cd5f3bb3ab59a4f06c020c062c13e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g778b0e43aad1e011012b8071b469c694">stp_set_dimension_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="group__vars.html#ga56"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga57">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a dimension parameter.  <a href="group__vars.html#g778b0e43aad1e011012b8071b469c694"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8f67ed7dcee969e77374fb4daf468d58">stp_set_boolean_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="group__vars.html#ga57"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga58">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a boolean parameter.  <a href="group__vars.html#g8f67ed7dcee969e77374fb4daf468d58"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5f4adaadb80cd2d94569881d96cfa02e">stp_set_curve_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="group__vars.html#ga58"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga59">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a curve parameter.  <a href="group__vars.html#g5f4adaadb80cd2d94569881d96cfa02e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1f63514f8ffd8ea56f0beee69398ee01">stp_set_array_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="group__vars.html#ga59"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga60">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set an array parameter.  <a href="group__vars.html#g1f63514f8ffd8ea56f0beee69398ee01"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd40038a74fa7548da5fcaec6687c8787">stp_set_raw_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="group__vars.html#ga60"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga61">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a raw parameter.  <a href="group__vars.html#gd40038a74fa7548da5fcaec6687c8787"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gec605c647cab13d61ab5e2822d9f7ead">stp_scale_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, double scale)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="group__vars.html#ga61"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga62">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Multiply the value of a float parameter by a scaling factor.  <a href="group__vars.html#gec605c647cab13d61ab5e2822d9f7ead"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g71306c3e3118d9a4545b0a3cefb863ea">stp_set_default_string_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#ga62"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga63">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#g71306c3e3118d9a4545b0a3cefb863ea"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g65b18994af3384af04e2bf77e288f54f">stp_set_default_string_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#ga63"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga64">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default string parameter.  <a href="group__vars.html#g65b18994af3384af04e2bf77e288f54f"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae28e4c640fba005a72e92af66327b50">stp_set_default_file_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#ga64"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga65">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#gae28e4c640fba005a72e92af66327b50"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdeae102d1bd65147221f56e6095f35ef">stp_set_default_file_parameter_n</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const char *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#ga65"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga66">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default file parameter.  <a href="group__vars.html#gdeae102d1bd65147221f56e6095f35ef"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g59b79c779211a72de534fb9e61548f97">stp_set_default_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, double value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="group__vars.html#ga66"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga67">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default float parameter.  <a href="group__vars.html#g59b79c779211a72de534fb9e61548f97"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gbf1d9c938d364598414e9f15c41c1f08">stp_set_default_int_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="group__vars.html#ga67"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga68">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default integer parameter.  <a href="group__vars.html#gbf1d9c938d364598414e9f15c41c1f08"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g18b8a4fb414245d2c30df9ee11057845">stp_set_default_dimension_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="group__vars.html#ga68"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga69">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default dimension parameter.  <a href="group__vars.html#g18b8a4fb414245d2c30df9ee11057845"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gd286782f691998858e30a202506bad74">stp_set_default_boolean_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="group__vars.html#ga69"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga70">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default boolean parameter.  <a href="group__vars.html#gd286782f691998858e30a202506bad74"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdd7769bfece8597cde869eced1239a1e">stp_set_default_curve_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="group__vars.html#ga70"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga71">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#ga0">stp_array_t</a> *value)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default curve parameter.  <a href="group__vars.html#gdd7769bfece8597cde869eced1239a1e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1620e4be3c7fb85262802338d3143f6">stp_set_default_array_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *value)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="group__vars.html#ga71"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga72">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default array parameter.  <a href="group__vars.html#ga1620e4be3c7fb85262802338d3143f6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf95184ecee86a92db2a7d3f050154a46">stp_set_default_raw_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, const void *value, size_t bytes)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="group__vars.html#ga72"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga73">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set a default raw parameter.  <a href="group__vars.html#gf95184ecee86a92db2a7d3f050154a46"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga59b141facb320c409d9071f469fdbc5">stp_get_string_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="group__vars.html#ga73"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga74">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a string parameter.  <a href="group__vars.html#ga59b141facb320c409d9071f469fdbc5"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5efb45e6883a2522fd7e78c6eb761c79">stp_get_file_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="group__vars.html#ga74"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga75">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a file parameter.  <a href="group__vars.html#g5efb45e6883a2522fd7e78c6eb761c79"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g46195f69cc57bd18a4cde5756dd84601">stp_get_float_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="group__vars.html#ga75"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga76">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a float parameter.  <a href="group__vars.html#g46195f69cc57bd18a4cde5756dd84601"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g22bc2b8307fb6a95dac7fcf3d35bf6b9">stp_get_int_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="group__vars.html#ga76"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga77">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an integer parameter.  <a href="group__vars.html#g22bc2b8307fb6a95dac7fcf3d35bf6b9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb4121cba599314c929d04cce0e850473">stp_get_dimension_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="group__vars.html#ga77"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga78">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a dimension parameter.  <a href="group__vars.html#gb4121cba599314c929d04cce0e850473"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4cc8b69619067f882035cca46e9ce0cd">stp_get_boolean_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="group__vars.html#ga78"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga79">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a boolean parameter.  <a href="group__vars.html#g4cc8b69619067f882035cca46e9ce0cd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1a5a2746548465d681d00c6301a26100">stp_get_curve_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="group__vars.html#ga79"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga80">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a curve parameter.  <a href="group__vars.html#g1a5a2746548465d681d00c6301a26100"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb918206f9b70fff5d58a16a762295981">stp_get_array_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="group__vars.html#ga80"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga81">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get an array parameter.  <a href="group__vars.html#gb918206f9b70fff5d58a16a762295981"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__raw__t.html">stp_raw_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9f4db93fc31ad52018bc3ad14b58bfc2">stp_get_raw_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="group__vars.html#ga81"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga82">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get a raw parameter.  <a href="group__vars.html#g9f4db93fc31ad52018bc3ad14b58bfc2"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gc7fe8cd335309d755fe5b54bf6b8e5a3">stp_clear_string_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="group__vars.html#ga82"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga83">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a string parameter.  <a href="group__vars.html#gc7fe8cd335309d755fe5b54bf6b8e5a3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g7acde85eb361525f5cf481bafddbc1bd">stp_clear_file_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="group__vars.html#ga83"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga84">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a file parameter.  <a href="group__vars.html#g7acde85eb361525f5cf481bafddbc1bd"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g740a5cab681f30b8cc5e4ca18197e472">stp_clear_float_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="group__vars.html#ga84"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga85">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a float parameter.  <a href="group__vars.html#g740a5cab681f30b8cc5e4ca18197e472"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g4841e9250e4c7f38f2267355402ffcc1">stp_clear_int_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="group__vars.html#ga85"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga86">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) an integer parameter.  <a href="group__vars.html#g4841e9250e4c7f38f2267355402ffcc1"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g28203d9250f232f9af290802cf2db881">stp_clear_dimension_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="group__vars.html#ga86"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga87">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a dimension parameter.  <a href="group__vars.html#g28203d9250f232f9af290802cf2db881"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge5b7e3356b3c1c893620fdeeea486e48">stp_clear_boolean_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="group__vars.html#ga87"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga88">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear (remove) a boolean parameter.  <a href="group__vars.html#ge5b7e3356b3c1c893620fdeeea486e48"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9e992f880bd74cd4097527a39aea7125">stp_clear_curve_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="group__vars.html#ga88"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga89">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a curve parameter.  <a href="group__vars.html#g9e992f880bd74cd4097527a39aea7125"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb9df68cbf9973203adfca5e1293b300a">stp_clear_array_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="group__vars.html#ga89"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga90">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear an array parameter.  <a href="group__vars.html#gb9df68cbf9973203adfca5e1293b300a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga79b051578077beca548be224062705c">stp_clear_raw_parameter</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#ga90"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga91">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Clear a raw parameter.  <a href="group__vars.html#ga79b051578077beca548be224062705c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g44793f2cf64b11917b8943d20ee43b9d">stp_set_string_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#ga91"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga92">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a string parameter.  <a href="group__vars.html#g44793f2cf64b11917b8943d20ee43b9d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8c04ab4487623a41e0b2600d466a88ad">stp_set_file_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#ga92"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga93">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a file parameter.  <a href="group__vars.html#g8c04ab4487623a41e0b2600d466a88ad"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g38a95079fd6f90a0c6a92c5ddeb104ca">stp_set_float_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#ga93"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga94">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a float parameter.  <a href="group__vars.html#g38a95079fd6f90a0c6a92c5ddeb104ca"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g1c724bc85737bf8c698a08bc2d441b3e">stp_set_int_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#ga94"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga95">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an integer parameter.  <a href="group__vars.html#g1c724bc85737bf8c698a08bc2d441b3e"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6fa1953ee96051566a261f3391da3857">stp_set_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#ga95"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga96">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a dimension parameter.  <a href="group__vars.html#g6fa1953ee96051566a261f3391da3857"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge12a7edf773cbe04fb98b171ba2c2fb9">stp_set_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#ga96"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga97">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a boolean parameter.  <a href="group__vars.html#ge12a7edf773cbe04fb98b171ba2c2fb9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g160150a3a39d66f5a807d1c750a57890">stp_set_curve_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#ga97"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga98">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a curveparameter.  <a href="group__vars.html#g160150a3a39d66f5a807d1c750a57890"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf2aada3c00f9b00bc6a65014da87e250">stp_set_array_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#ga98"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga99">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of an array parameter.  <a href="group__vars.html#gf2aada3c00f9b00bc6a65014da87e250"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9fe388535a67f8360ab21f58233c0e17">stp_set_raw_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#ga99"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga100">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Set the activity of a raw parameter.  <a href="group__vars.html#g9fe388535a67f8360ab21f58233c0e17"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gae6b21f76f675516e9189c47444e17cf">stp_check_string_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#ga100"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga101">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a string parameter is set.  <a href="group__vars.html#gae6b21f76f675516e9189c47444e17cf"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb411dae8fb16ec9f289d4f2f1ecabcfc">stp_check_file_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#ga101"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga102">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a file parameter is set.  <a href="group__vars.html#gb411dae8fb16ec9f289d4f2f1ecabcfc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g2deea3612965e28cd0d513c5850ca074">stp_check_float_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#ga102"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga103">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a float parameter is set.  <a href="group__vars.html#g2deea3612965e28cd0d513c5850ca074"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g056b021334fe812aa14bbbfd60aafba8">stp_check_int_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#ga103"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga104">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an integer parameter is set.  <a href="group__vars.html#g056b021334fe812aa14bbbfd60aafba8"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gcdfa2f747081721c03b10484a832a535">stp_check_dimension_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#ga104"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga105">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a dimension parameter is set.  <a href="group__vars.html#gcdfa2f747081721c03b10484a832a535"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gadfd66825dd58fb8e0851d493445c4e4">stp_check_boolean_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#ga105"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga106">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a boolean parameter is set.  <a href="group__vars.html#gadfd66825dd58fb8e0851d493445c4e4"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#geecfc1f1fdc97ea165ae35b64de95178">stp_check_curve_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#ga106"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga107">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a curve parameter is set.  <a href="group__vars.html#geecfc1f1fdc97ea165ae35b64de95178"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gdf6c305c48d012bc138db025c9bd63df">stp_check_array_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#ga107"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga108">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a> active)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if an array parameter is set.  <a href="group__vars.html#gdf6c305c48d012bc138db025c9bd63df"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5bd30b408d6ec16b3999dce5e540a5fa">stp_check_raw_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, <a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a> active)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#ga108"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga109">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Check if a raw parameter is set.  <a href="group__vars.html#g5bd30b408d6ec16b3999dce5e540a5fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gda8dd20ab17a9b403c68b4cd86fb529c">stp_get_string_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#ga109"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga110">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a string parameter.  <a href="group__vars.html#gda8dd20ab17a9b403c68b4cd86fb529c"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g0f09e85b570ffee4a4d94853bb22bcb3">stp_get_file_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#ga110"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga111">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a file parameter.  <a href="group__vars.html#g0f09e85b570ffee4a4d94853bb22bcb3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g28d01beda4b54cec395654847dbbc301">stp_get_float_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#ga111"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga112">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a float parameter.  <a href="group__vars.html#g28d01beda4b54cec395654847dbbc301"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gac76d8e06c3ce3fb0f27c0c80d6ad5fc">stp_get_int_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#ga112"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga113">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an integer parameter.  <a href="group__vars.html#gac76d8e06c3ce3fb0f27c0c80d6ad5fc"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8125d08f90002e654f2e45427e2f0251">stp_get_dimension_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#ga113"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga114">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a dimension parameter.  <a href="group__vars.html#g8125d08f90002e654f2e45427e2f0251"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g361d0ba27ad2ec9e99e5eec05f2e76a6">stp_get_boolean_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#ga114"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga115">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a boolean parameter.  <a href="group__vars.html#g361d0ba27ad2ec9e99e5eec05f2e76a6"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gb686075ecbdf349387c356826b432191">stp_get_curve_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#ga115"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga116">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a curve parameter.  <a href="group__vars.html#gb686075ecbdf349387c356826b432191"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g64e5f74483ffb7bd4412f4eefeb22250">stp_get_array_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#ga116"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga135">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga117">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of an array parameter.  <a href="group__vars.html#g64e5f74483ffb7bd4412f4eefeb22250"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#gb11c7af74fa0595684377cafe4d4eb53">stp_parameter_activity_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g57abcfb2fa58e743f9d30f579481845a">stp_get_raw_parameter_active</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#ga117"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga118">stp_get_media_size</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *width, int *height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the activity status of a raw parameter.  <a href="group__vars.html#g57abcfb2fa58e743f9d30f579481845a"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge690d9171bcdb0fedf981804bb923fac">stp_get_media_size</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *width, int *height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#ga118"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga119">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media (paper) size.  <a href="group__vars.html#ge690d9171bcdb0fedf981804bb923fac"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gebcb03afca6bb0d94e71bdf570d09af9">stp_get_imageable_area</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *left, int *right, int *bottom, int *top)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#ga119"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga120">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the imagable area of the page.  <a href="group__vars.html#gebcb03afca6bb0d94e71bdf570d09af9"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf2c1a37f8d837fae61bb18de1cd7bdc3">stp_get_size_limit</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *max_width, int *max_height, int *min_width, int *min_height)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#ga120"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga121">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int *x, int *y)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get the media size limits.  <a href="group__vars.html#gf2c1a37f8d837fae61bb18de1cd7bdc3"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g5735451225c2a355cb11c165e011637d">stp_describe_resolution</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int *x, int *y)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#ga121"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga122">stp_verify</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Retrieve the printing resolution of the selected resolution.  <a href="group__vars.html#g5735451225c2a355cb11c165e011637d"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ge28b0d78641811b1625a52971a2d11fa">stp_verify</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#ga122"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga123">stp_default_settings</a> (void)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Verify parameters.  <a href="group__vars.html#ge28b0d78641811b1625a52971a2d11fa"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g9f897908b19f5f0cdaf75b483d46e041">stp_default_settings</a> (void)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#ga123"></a><br></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga124">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#ga4">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#ga5">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Get default global settings.  <a href="group__vars.html#g9f897908b19f5f0cdaf75b483d46e041"></a><br></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#geb61df54d59bfebdcb77b1e5e993ebaa">stp_allocate_component_data</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name, <a class="el" href="group__vars.html#gd31fc080a2bd980c6a05a541dc1612a3">stp_copy_data_func_t</a> copyfunc, <a class="el" href="group__vars.html#g3f7233002f4db790a077e33c2661665c">stp_free_data_func_t</a> freefunc, void *data)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga125">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g089f9a34f26f700f43858ba3959d8f13">stp_destroy_component_data</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga126">stp_get_component_data</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8eea0724106ea7174b808026ae8d1a5c">stp_get_component_data</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#ga136">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga127">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__vars.html#g1d02c21b8f025b121dd340db9adf3516">stp_parameter_verify_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gf64e586fca554f2dd65157a76eaad34a">stp_verify_parameter</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const char *parameter, int quiet)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga128">stp_get_verified</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga1b826f02f84aa038c6862575770b629">stp_get_verified</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga129">stp_set_verified</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g8a2924dd6393431e994d22c704ec25fc">stp_set_verified</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga130">stp_copy_options</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#gbd8b19b70d2f2fc7dcd7c896b3ed5d98">stp_copy_options</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *vd, const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *vs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#ga131">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="group__vars.html#g6a08746f33133e8873236b35eb1e7a62">stp_fill_parameter_settings</a> (<a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *desc, const <a class="el" href="structstp__parameter__t.html">stp_parameter_t</a> *param)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Print job functions. 
 <p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/weave_8h.html b/doc/gutenprint/html/weave_8h.html
index 085669a..9082fa2 100644
--- a/doc/gutenprint/html/weave_8h.html
+++ b/doc/gutenprint/html/weave_8h.html
@@ -2,11 +2,25 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/weave.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>weave.h File Reference</h1>Softweave functions. <a href="#_details">More...</a>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -27,67 +41,67 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstp__linebounds__t.html">stp_linebounds_t</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a0">STP_MAX_WEAVE</a>&nbsp;&nbsp;&nbsp;(16)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#46ee59dd8e65c35e69ba8cfa94e90786">STP_MAX_WEAVE</a>&nbsp;&nbsp;&nbsp;(16)</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a1">stp_packfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a3">stp_flushfunc</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int passno, int vertical_subpass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#76c426b3b4c3b2503c54f2c2a013768a">stp_flushfunc</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int passno, int vertical_subpass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int n)</td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="weave_8h.html#a26a11">STP_WEAVE_ZIGZAG</a>, 
-<a class="el" href="weave_8h.html#a26a12">STP_WEAVE_ASCENDING</a>, 
-<a class="el" href="weave_8h.html#a26a13">STP_WEAVE_DESCENDING</a>, 
-<a class="el" href="weave_8h.html#a26a14">STP_WEAVE_ASCENDING_2X</a>, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027">stp_weave_strategy_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc">STP_WEAVE_ZIGZAG</a>, 
+<a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d">STP_WEAVE_ASCENDING</a>, 
+<a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f">STP_WEAVE_DESCENDING</a>, 
+<a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12">STP_WEAVE_ASCENDING_2X</a>, 
 <br>
-&nbsp;&nbsp;<a class="el" href="weave_8h.html#a26a15">STP_WEAVE_STAGGERED</a>, 
-<a class="el" href="weave_8h.html#a26a16">STP_WEAVE_ASCENDING_3X</a>
+&nbsp;&nbsp;<a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501">STP_WEAVE_STAGGERED</a>, 
+<a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b">STP_WEAVE_ASCENDING_3X</a>
 <br>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a17">stp_initialize_weave</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, <a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>, <a class="el" href="weave_8h.html#a3">stp_flushfunc</a>, <a class="el" href="weave_8h.html#a2">stp_fillfunc</a>, <a class="el" href="weave_8h.html#a1">stp_packfunc</a>, <a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#9b72df98be9b9e25b42aca6ef5901d35">stp_initialize_weave</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027">stp_weave_strategy_t</a>, <a class="el" href="weave_8h.html#76c426b3b4c3b2503c54f2c2a013768a">stp_flushfunc</a>, <a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a>, <a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a>, <a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a18">stp_flush_all</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#5b0aac599abc4859e2d208db7185cdbf">stp_flush_all</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a19">stp_write_weave</a> (<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, unsigned char *const cols[])</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#b021ec20fafa48e57495123df1533b62">stp_write_weave</a> (<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, unsigned char *const cols[])</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a20">stp_get_lineoffsets_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#816c57bb673bebebaa42576b3e452206">stp_get_lineoffsets_by_pass</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a21">stp_get_lineactive_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#14c1a0f43a0353f7771632d3a0356cea">stp_get_lineactive_by_pass</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a22">stp_get_linecount_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#46dacaec8d953a33f6c15299f3a91046">stp_get_linecount_by_pass</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a23">stp_get_linebases_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#207eac262dceb86f20fe32b048b257ad">stp_get_linebases_by_pass</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a24">stp_get_pass_by_pass</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int pass)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#129f77403ade9f504dd38185a7ab6209">stp_get_pass_by_pass</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int pass)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a25">stp_weave_parameters_by_row</a> (const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int vertical_subpass, <a class="el" href="structstp__weave__t.html">stp_weave_t</a> *w)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#3dbb20fd24c73c2982819b1f184b7ee3">stp_weave_parameters_by_row</a> (const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int row, int vertical_subpass, <a class="el" href="structstp__weave__t.html">stp_weave_t</a> *w)</td></tr>
 
 <tr><td colspan="2"><br><h2>Variables</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a5">stp_pack_tiff</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#27cae2ded3a9434dd6f332dbf6721f71">stp_pack_tiff</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6">stp_pack_uncompressed</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#b81173e35f655b1a8f0047cbadce5391">stp_pack_uncompressed</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a7">stp_fill_tiff</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#6c47bead0399664b9041a6d5687b091e">stp_fill_tiff</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a8">stp_fill_uncompressed</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#fb161f053574d9cd4a47b613b614b0f3">stp_fill_uncompressed</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a9">stp_compute_tiff_linewidth</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a6df061ed81c1a6ecb8854b6eab4e276">stp_compute_tiff_linewidth</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#a10">stp_compute_uncompressed_linewidth</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="weave_8h.html#f6c7a76f229fdc0be020a53a15a4a5f5">stp_compute_uncompressed_linewidth</a></td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 Softweave functions. 
 <p>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="a0" args="" --><p>
+<a class="anchor" name="46ee59dd8e65c35e69ba8cfa94e90786"></a><!-- doxytag: member="weave.h::STP_MAX_WEAVE" ref="46ee59dd8e65c35e69ba8cfa94e90786" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -111,13 +125,13 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a4"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="a4" args="(stp_vars_t *v, int n)" --><p>
+<a class="anchor" name="520099a705f78fd503d204665ee21d5d"></a><!-- doxytag: member="weave.h::stp_compute_linewidth_func" ref="520099a705f78fd503d204665ee21d5d" args="(stp_vars_t *v, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef int <a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int n)          </td>
+          <td class="md" nowrap valign="top">typedef int <a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int n)          </td>
         </tr>
       </table>
     </td>
@@ -134,13 +148,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="weave.h::stp_fillfunc" ref="a2" args="(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)" --><p>
+<a class="anchor" name="910269f43cbcff87ce004bb20b659d9e"></a><!-- doxytag: member="weave.h::stp_fillfunc" ref="910269f43cbcff87ce004bb20b659d9e" args="(stp_vars_t *v, int row, int subpass, int width, int missingstartrows, int color)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void <a class="el" href="weave_8h.html#a2">stp_fillfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)          </td>
+          <td class="md" nowrap valign="top">typedef void <a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a>(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int row, int subpass, int width, int missingstartrows, int color)          </td>
         </tr>
       </table>
     </td>
@@ -157,13 +171,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="weave.h::stp_flushfunc" ref="a3" args="(stp_vars_t *v, int passno, int vertical_subpass)" --><p>
+<a class="anchor" name="76c426b3b4c3b2503c54f2c2a013768a"></a><!-- doxytag: member="weave.h::stp_flushfunc" ref="76c426b3b4c3b2503c54f2c2a013768a" args="(stp_vars_t *v, int passno, int vertical_subpass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef void <a class="el" href="weave_8h.html#a3">stp_flushfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, int passno, int vertical_subpass)          </td>
+          <td class="md" nowrap valign="top">typedef void <a class="el" href="weave_8h.html#76c426b3b4c3b2503c54f2c2a013768a">stp_flushfunc</a>(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, int passno, int vertical_subpass)          </td>
         </tr>
       </table>
     </td>
@@ -180,13 +194,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="weave.h::stp_packfunc" ref="a1" args="(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)" --><p>
+<a class="anchor" name="ebd02297dfdf36f818d0ff48c900f561"></a><!-- doxytag: member="weave.h::stp_packfunc" ref="ebd02297dfdf36f818d0ff48c900f561" args="(stp_vars_t *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef int <a class="el" href="weave_8h.html#a1">stp_packfunc</a>(<a class="el" href="group__vars.html#ga0">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)          </td>
+          <td class="md" nowrap valign="top">typedef int <a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a>(<a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *v, const unsigned char *line, int height, unsigned char *comp_buf, unsigned char **comp_ptr, int *first, int *last)          </td>
         </tr>
       </table>
     </td>
@@ -204,13 +218,13 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a26"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="a26" args="" --><p>
+<a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce027"></a><!-- doxytag: member="weave.h::stp_weave_strategy_t" ref="6233c2f715aee6e6c2e9935f0e2ce027" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027">stp_weave_strategy_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -226,17 +240,17 @@ Softweave functions.
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a26a11"></a><!-- doxytag: member="STP_WEAVE_ZIGZAG" ref="a26a11" args="" -->STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc"></a><!-- doxytag: member="STP_WEAVE_ZIGZAG" ref="6233c2f715aee6e6c2e9935f0e2ce02741a2ca9b1c97ec5a62795faf4968dcfc" args="" -->STP_WEAVE_ZIGZAG</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a12"></a><!-- doxytag: member="STP_WEAVE_ASCENDING" ref="a26a12" args="" -->STP_WEAVE_ASCENDING</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d"></a><!-- doxytag: member="STP_WEAVE_ASCENDING" ref="6233c2f715aee6e6c2e9935f0e2ce027cfdbe44826dff4a2b9853b1eb39d747d" args="" -->STP_WEAVE_ASCENDING</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a13"></a><!-- doxytag: member="STP_WEAVE_DESCENDING" ref="a26a13" args="" -->STP_WEAVE_DESCENDING</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f"></a><!-- doxytag: member="STP_WEAVE_DESCENDING" ref="6233c2f715aee6e6c2e9935f0e2ce027c7435712ea733caf7ee62d380c0f960f" args="" -->STP_WEAVE_DESCENDING</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a14"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_2X" ref="a26a14" args="" -->STP_WEAVE_ASCENDING_2X</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_2X" ref="6233c2f715aee6e6c2e9935f0e2ce027e9dd082ce13e2fd30a8fd0c8efbe1d12" args="" -->STP_WEAVE_ASCENDING_2X</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a15"></a><!-- doxytag: member="STP_WEAVE_STAGGERED" ref="a26a15" args="" -->STP_WEAVE_STAGGERED</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501"></a><!-- doxytag: member="STP_WEAVE_STAGGERED" ref="6233c2f715aee6e6c2e9935f0e2ce0279aab99f511c9d24e64a229a4b309c501" args="" -->STP_WEAVE_STAGGERED</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a26a16"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_3X" ref="a26a16" args="" -->STP_WEAVE_ASCENDING_3X</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b"></a><!-- doxytag: member="STP_WEAVE_ASCENDING_3X" ref="6233c2f715aee6e6c2e9935f0e2ce027de577c11bb8893c274e74474a4fa208b" args="" -->STP_WEAVE_ASCENDING_3X</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -244,7 +258,7 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a18"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="a18" args="(stp_vars_t *v)" --><p>
+<a class="anchor" name="5b0aac599abc4859e2d208db7185cdbf"></a><!-- doxytag: member="weave.h::stp_flush_all" ref="5b0aac599abc4859e2d208db7185cdbf" args="(stp_vars_t *v)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -252,7 +266,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_flush_all           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>v</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -272,7 +286,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="weave.h::stp_get_lineactive_by_pass" ref="a21" args="(const stp_vars_t *v, int pass)" --><p>
+<a class="anchor" name="14c1a0f43a0353f7771632d3a0356cea"></a><!-- doxytag: member="weave.h::stp_get_lineactive_by_pass" ref="14c1a0f43a0353f7771632d3a0356cea" args="(const stp_vars_t *v, int pass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -280,7 +294,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__lineactive__t.html">stp_lineactive_t</a>* stp_get_lineactive_by_pass           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -309,7 +323,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="weave.h::stp_get_linebases_by_pass" ref="a23" args="(const stp_vars_t *v, int pass)" --><p>
+<a class="anchor" name="207eac262dceb86f20fe32b048b257ad"></a><!-- doxytag: member="weave.h::stp_get_linebases_by_pass" ref="207eac262dceb86f20fe32b048b257ad" args="(const stp_vars_t *v, int pass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -317,7 +331,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top">const <a class="el" href="structstp__linebufs__t.html">stp_linebufs_t</a>* stp_get_linebases_by_pass           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -346,7 +360,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="weave.h::stp_get_linecount_by_pass" ref="a22" args="(const stp_vars_t *v, int pass)" --><p>
+<a class="anchor" name="46dacaec8d953a33f6c15299f3a91046"></a><!-- doxytag: member="weave.h::stp_get_linecount_by_pass" ref="46dacaec8d953a33f6c15299f3a91046" args="(const stp_vars_t *v, int pass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -354,7 +368,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__linecount__t.html">stp_linecount_t</a>* stp_get_linecount_by_pass           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -383,7 +397,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="weave.h::stp_get_lineoffsets_by_pass" ref="a20" args="(const stp_vars_t *v, int pass)" --><p>
+<a class="anchor" name="816c57bb673bebebaa42576b3e452206"></a><!-- doxytag: member="weave.h::stp_get_lineoffsets_by_pass" ref="816c57bb673bebebaa42576b3e452206" args="(const stp_vars_t *v, int pass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -391,7 +405,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__lineoff__t.html">stp_lineoff_t</a>* stp_get_lineoffsets_by_pass           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -420,7 +434,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a24"></a><!-- doxytag: member="weave.h::stp_get_pass_by_pass" ref="a24" args="(const stp_vars_t *v, int pass)" --><p>
+<a class="anchor" name="129f77403ade9f504dd38185a7ab6209"></a><!-- doxytag: member="weave.h::stp_get_pass_by_pass" ref="129f77403ade9f504dd38185a7ab6209" args="(const stp_vars_t *v, int pass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -428,7 +442,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__pass__t.html">stp_pass_t</a>* stp_get_pass_by_pass           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -457,7 +471,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="weave.h::stp_initialize_weave" ref="a17" args="(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)" --><p>
+<a class="anchor" name="9b72df98be9b9e25b42aca6ef5901d35"></a><!-- doxytag: member="weave.h::stp_initialize_weave" ref="9b72df98be9b9e25b42aca6ef5901d35" args="(stp_vars_t *v, int jets, int separation, int oversample, int horizontal, int vertical, int ncolors, int bitwidth, int linewidth, int line_count, int first_line, int page_height, const int *head_offset, stp_weave_strategy_t, stp_flushfunc, stp_fillfunc, stp_packfunc, stp_compute_linewidth_func)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -465,7 +479,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_initialize_weave           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -543,31 +557,31 @@ Softweave functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a26">stp_weave_strategy_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#6233c2f715aee6e6c2e9935f0e2ce027">stp_weave_strategy_t</a>&nbsp;</td>
           <td class="mdname" nowrap>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a3">stp_flushfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#76c426b3b4c3b2503c54f2c2a013768a">stp_flushfunc</a>&nbsp;</td>
           <td class="mdname" nowrap>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a2">stp_fillfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a>&nbsp;</td>
           <td class="mdname" nowrap>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a1">stp_packfunc</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a>&nbsp;</td>
           <td class="mdname" nowrap>, </td>
         </tr>
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a>&nbsp;</td>
           <td class="mdname" nowrap></td>
         </tr>
         <tr>
@@ -590,7 +604,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a25"></a><!-- doxytag: member="weave.h::stp_weave_parameters_by_row" ref="a25" args="(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)" --><p>
+<a class="anchor" name="3dbb20fd24c73c2982819b1f184b7ee3"></a><!-- doxytag: member="weave.h::stp_weave_parameters_by_row" ref="3dbb20fd24c73c2982819b1f184b7ee3" args="(const stp_vars_t *v, int row, int vertical_subpass, stp_weave_t *w)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -598,7 +612,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_weave_parameters_by_row           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -639,7 +653,7 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="weave.h::stp_write_weave" ref="a19" args="(stp_vars_t *v, unsigned char *const cols[])" --><p>
+<a class="anchor" name="b021ec20fafa48e57495123df1533b62"></a><!-- doxytag: member="weave.h::stp_write_weave" ref="b021ec20fafa48e57495123df1533b62" args="(stp_vars_t *v, unsigned char *const cols[])" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -647,7 +661,7 @@ Softweave functions.
         <tr>
           <td class="md" nowrap valign="top">void stp_write_weave           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#ga0">stp_vars_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__vars.html#gde33aeed00b53e4af71ee1f7c4326279">stp_vars_t</a> *&nbsp;</td>
           <td class="mdname" nowrap> <em>v</em>, </td>
         </tr>
         <tr>
@@ -677,13 +691,13 @@ Softweave functions.
   </tr>
 </table>
 <hr><h2>Variable Documentation</h2>
-<a class="anchor" name="a9"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="a9" args="" --><p>
+<a class="anchor" name="a6df061ed81c1a6ecb8854b6eab4e276"></a><!-- doxytag: member="weave.h::stp_compute_tiff_linewidth" ref="a6df061ed81c1a6ecb8854b6eab4e276" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a9">stp_compute_tiff_linewidth</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a6df061ed81c1a6ecb8854b6eab4e276">stp_compute_tiff_linewidth</a>          </td>
         </tr>
       </table>
     </td>
@@ -700,13 +714,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="a10" args="" --><p>
+<a class="anchor" name="f6c7a76f229fdc0be020a53a15a4a5f5"></a><!-- doxytag: member="weave.h::stp_compute_uncompressed_linewidth" ref="f6c7a76f229fdc0be020a53a15a4a5f5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a4">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#a10">stp_compute_uncompressed_linewidth</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#520099a705f78fd503d204665ee21d5d">stp_compute_linewidth_func</a> <a class="el" href="weave_8h.html#f6c7a76f229fdc0be020a53a15a4a5f5">stp_compute_uncompressed_linewidth</a>          </td>
         </tr>
       </table>
     </td>
@@ -723,13 +737,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="a7" args="" --><p>
+<a class="anchor" name="6c47bead0399664b9041a6d5687b091e"></a><!-- doxytag: member="weave.h::stp_fill_tiff" ref="6c47bead0399664b9041a6d5687b091e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a> <a class="el" href="weave_8h.html#a7">stp_fill_tiff</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a> <a class="el" href="weave_8h.html#6c47bead0399664b9041a6d5687b091e">stp_fill_tiff</a>          </td>
         </tr>
       </table>
     </td>
@@ -746,13 +760,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="a8" args="" --><p>
+<a class="anchor" name="fb161f053574d9cd4a47b613b614b0f3"></a><!-- doxytag: member="weave.h::stp_fill_uncompressed" ref="fb161f053574d9cd4a47b613b614b0f3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a2">stp_fillfunc</a> <a class="el" href="weave_8h.html#a8">stp_fill_uncompressed</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#910269f43cbcff87ce004bb20b659d9e">stp_fillfunc</a> <a class="el" href="weave_8h.html#fb161f053574d9cd4a47b613b614b0f3">stp_fill_uncompressed</a>          </td>
         </tr>
       </table>
     </td>
@@ -769,13 +783,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="a5" args="" --><p>
+<a class="anchor" name="27cae2ded3a9434dd6f332dbf6721f71"></a><!-- doxytag: member="weave.h::stp_pack_tiff" ref="27cae2ded3a9434dd6f332dbf6721f71" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a> <a class="el" href="weave_8h.html#a5">stp_pack_tiff</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a> <a class="el" href="weave_8h.html#27cae2ded3a9434dd6f332dbf6721f71">stp_pack_tiff</a>          </td>
         </tr>
       </table>
     </td>
@@ -792,13 +806,13 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="a6" args="" --><p>
+<a class="anchor" name="b81173e35f655b1a8f0047cbadce5391"></a><!-- doxytag: member="weave.h::stp_pack_uncompressed" ref="b81173e35f655b1a8f0047cbadce5391" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#a1">stp_packfunc</a> <a class="el" href="weave_8h.html#a6">stp_pack_uncompressed</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="weave_8h.html#ebd02297dfdf36f818d0ff48c900f561">stp_packfunc</a> <a class="el" href="weave_8h.html#b81173e35f655b1a8f0047cbadce5391">stp_pack_uncompressed</a>          </td>
         </tr>
       </table>
     </td>
@@ -815,8 +829,8 @@ Softweave functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprint/html/xml_8h.html b/doc/gutenprint/html/xml_8h.html
index 62af33a..5c4760d 100644
--- a/doc/gutenprint/html/xml_8h.html
+++ b/doc/gutenprint/html/xml_8h.html
@@ -2,74 +2,88 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprint API Reference: include/gutenprint/xml.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a> | <a class="qindex" href="pages.html">Related&nbsp;Pages</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="modules.html"><span>Modules</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+    <li><a href="pages.html"><span>Related&nbsp;Pages</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprint</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprint_2F.html">gutenprint</a></div>
 <h1>xml.h File Reference</h1>XML tree functions. <a href="#_details">More...</a>
 <p>
 <code>#include &lt;<a class="el" href="mxml_8h.html">gutenprint/mxml.h</a>&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a> )(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef int(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#ec3dca5a8c562175532452b7a055200f">stp_xml_parse_func</a> )(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a1">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a> parse_func)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#3258e11973b45c04e9ec1810789cface">stp_register_xml_parser</a> (const char *name, <a class="el" href="xml_8h.html#ec3dca5a8c562175532452b7a055200f">stp_xml_parse_func</a> parse_func)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a2">stp_unregister_xml_parser</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#bdff70654d8ca31445e0957cfad68816">stp_unregister_xml_parser</a> (const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a3">stp_register_xml_preload</a> (const char *filename)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#0377f341fce4c764d695b851cf90125c">stp_register_xml_preload</a> (const char *filename)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a4">stp_unregister_xml_preload</a> (const char *filename)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#f9605dfeaf5ba8c41b42aba2c09b4f20">stp_unregister_xml_preload</a> (const char *filename)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a5">stp_xml_init_defaults</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#9e2620e798edcd889cd80454374a0a1d">stp_xml_init_defaults</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a6">stp_xml_parse_file</a> (const char *file)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#477e8c523df78a068e98be5e929d6825">stp_xml_parse_file</a> (const char *file)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a7">stp_xmlstrtol</a> (const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#56885d576d38f8fbffce10834e892117">stp_xmlstrtol</a> (const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a8">stp_xmlstrtoul</a> (const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">unsigned long&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#9d7f6cba6d4f5b8b01b6d3c192d10596">stp_xmlstrtoul</a> (const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a9">stp_xmlstrtod</a> (const char *textval)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#666632a9a3cb7f802fd5478d68d57166">stp_xmlstrtod</a> (const char *textval)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a10">stp_xml_init</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#e279cdb2639cb00884563204c586e34a">stp_xml_init</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a11">stp_xml_exit</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#d35445001b4f0ff02b45cf411b056cb2">stp_xml_exit</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a12">stp_xml_get_node</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *xmlroot,...)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#acec0c2b6d806a70b74c2c9efb5ca895">stp_xml_get_node</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *xmlroot,...)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a13">stp_xmldoc_create_generic</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#d698808efae24e1f0002243256171fc0">stp_xmldoc_create_generic</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a14">stp_xml_preinit</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#e2aeb50ec9bffd4cc7ff4b8756ce503a">stp_xml_preinit</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a15">stp_sequence_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#174add090763cd3d8a019da75257e9c5">stp_sequence_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a16">stp_xmltree_create_from_sequence</a> (const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *seq)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#134d8ffe83aa1bc29ca65869af337479">stp_xmltree_create_from_sequence</a> (const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *seq)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a17">stp_curve_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#4b39835d489b183bdf939551f7b6871b">stp_curve_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *da)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a18">stp_xmltree_create_from_curve</a> (const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#286050c77ae8ee255a7b6035b88d5fb4">stp_xmltree_create_from_curve</a> (const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a19">stp_array_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#301d2355b8bb9986a7bc4f84cc6c9d40">stp_array_create_from_xmltree</a> (<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a20">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#ga0">stp_array_t</a> *array)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#90e7cdadf10d6492082fd008b79853b0">stp_xmltree_create_from_array</a> (const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *array)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#a21">stp_xml_parse_file_named</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="xml_8h.html#2ff6722b18cd21c91e60e7ef1cedc0d4">stp_xml_parse_file_named</a> (const char *name)</td></tr>
 
 </table>
 <hr><a name="_details"></a><h2>Detailed Description</h2>
 XML tree functions. 
 <p>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a0"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="a0" args=")(stp_mxml_node_t *node, const char *file)" --><p>
+<a class="anchor" name="ec3dca5a8c562175532452b7a055200f"></a><!-- doxytag: member="xml.h::stp_xml_parse_func" ref="ec3dca5a8c562175532452b7a055200f" args=")(stp_mxml_node_t *node, const char *file)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef int(* <a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a>)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)          </td>
+          <td class="md" nowrap valign="top">typedef int(* <a class="el" href="xml_8h.html#ec3dca5a8c562175532452b7a055200f">stp_xml_parse_func</a>)(<a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *node, const char *file)          </td>
         </tr>
       </table>
     </td>
@@ -87,13 +101,13 @@ XML tree functions.
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a19"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="a19" args="(stp_mxml_node_t *array)" --><p>
+<a class="anchor" name="301d2355b8bb9986a7bc4f84cc6c9d40"></a><!-- doxytag: member="xml.h::stp_array_create_from_xmltree" ref="301d2355b8bb9986a7bc4f84cc6c9d40" args="(stp_mxml_node_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#ga0">stp_array_t</a>* stp_array_create_from_xmltree           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a>* stp_array_create_from_xmltree           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
@@ -115,13 +129,13 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="a17" args="(stp_mxml_node_t *da)" --><p>
+<a class="anchor" name="4b39835d489b183bdf939551f7b6871b"></a><!-- doxytag: member="xml.h::stp_curve_create_from_xmltree" ref="4b39835d489b183bdf939551f7b6871b" args="(stp_mxml_node_t *da)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#ga0">stp_curve_t</a>* stp_curve_create_from_xmltree           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a>* stp_curve_create_from_xmltree           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>da</em>          </td>
@@ -143,7 +157,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a1"></a><!-- doxytag: member="xml.h::stp_register_xml_parser" ref="a1" args="(const char *name, stp_xml_parse_func parse_func)" --><p>
+<a class="anchor" name="3258e11973b45c04e9ec1810789cface"></a><!-- doxytag: member="xml.h::stp_register_xml_parser" ref="3258e11973b45c04e9ec1810789cface" args="(const char *name, stp_xml_parse_func parse_func)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -157,7 +171,7 @@ XML tree functions.
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="xml_8h.html#a0">stp_xml_parse_func</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="xml_8h.html#ec3dca5a8c562175532452b7a055200f">stp_xml_parse_func</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>parse_func</em></td>
         </tr>
         <tr>
@@ -180,7 +194,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="a3" args="(const char *filename)" --><p>
+<a class="anchor" name="0377f341fce4c764d695b851cf90125c"></a><!-- doxytag: member="xml.h::stp_register_xml_preload" ref="0377f341fce4c764d695b851cf90125c" args="(const char *filename)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -208,13 +222,13 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="a15" args="(stp_mxml_node_t *da)" --><p>
+<a class="anchor" name="174add090763cd3d8a019da75257e9c5"></a><!-- doxytag: member="xml.h::stp_sequence_create_from_xmltree" ref="174add090763cd3d8a019da75257e9c5" args="(stp_mxml_node_t *da)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#ga0">stp_sequence_t</a>* stp_sequence_create_from_xmltree           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a>* stp_sequence_create_from_xmltree           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>da</em>          </td>
@@ -236,7 +250,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="a2" args="(const char *name)" --><p>
+<a class="anchor" name="bdff70654d8ca31445e0957cfad68816"></a><!-- doxytag: member="xml.h::stp_unregister_xml_parser" ref="bdff70654d8ca31445e0957cfad68816" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -264,7 +278,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="a4" args="(const char *filename)" --><p>
+<a class="anchor" name="f9605dfeaf5ba8c41b42aba2c09b4f20"></a><!-- doxytag: member="xml.h::stp_unregister_xml_preload" ref="f9605dfeaf5ba8c41b42aba2c09b4f20" args="(const char *filename)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -292,7 +306,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="a11" args="(void)" --><p>
+<a class="anchor" name="d35445001b4f0ff02b45cf411b056cb2"></a><!-- doxytag: member="xml.h::stp_xml_exit" ref="d35445001b4f0ff02b45cf411b056cb2" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -320,7 +334,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="a12" args="(stp_mxml_node_t *xmlroot,...)" --><p>
+<a class="anchor" name="acec0c2b6d806a70b74c2c9efb5ca895"></a><!-- doxytag: member="xml.h::stp_xml_get_node" ref="acec0c2b6d806a70b74c2c9efb5ca895" args="(stp_mxml_node_t *xmlroot,...)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -357,7 +371,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="a10" args="(void)" --><p>
+<a class="anchor" name="e279cdb2639cb00884563204c586e34a"></a><!-- doxytag: member="xml.h::stp_xml_init" ref="e279cdb2639cb00884563204c586e34a" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -385,7 +399,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="a5" args="(void)" --><p>
+<a class="anchor" name="9e2620e798edcd889cd80454374a0a1d"></a><!-- doxytag: member="xml.h::stp_xml_init_defaults" ref="9e2620e798edcd889cd80454374a0a1d" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -413,7 +427,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a6"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="a6" args="(const char *file)" --><p>
+<a class="anchor" name="477e8c523df78a068e98be5e929d6825"></a><!-- doxytag: member="xml.h::stp_xml_parse_file" ref="477e8c523df78a068e98be5e929d6825" args="(const char *file)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -441,7 +455,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="a21" args="(const char *name)" --><p>
+<a class="anchor" name="2ff6722b18cd21c91e60e7ef1cedc0d4"></a><!-- doxytag: member="xml.h::stp_xml_parse_file_named" ref="2ff6722b18cd21c91e60e7ef1cedc0d4" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -469,7 +483,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="a14" args="(void)" --><p>
+<a class="anchor" name="e2aeb50ec9bffd4cc7ff4b8756ce503a"></a><!-- doxytag: member="xml.h::stp_xml_preinit" ref="e2aeb50ec9bffd4cc7ff4b8756ce503a" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -497,7 +511,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="a13" args="(void)" --><p>
+<a class="anchor" name="d698808efae24e1f0002243256171fc0"></a><!-- doxytag: member="xml.h::stp_xmldoc_create_generic" ref="d698808efae24e1f0002243256171fc0" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -525,7 +539,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="a9" args="(const char *textval)" --><p>
+<a class="anchor" name="666632a9a3cb7f802fd5478d68d57166"></a><!-- doxytag: member="xml.h::stp_xmlstrtod" ref="666632a9a3cb7f802fd5478d68d57166" args="(const char *textval)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -553,7 +567,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="a7" args="(const char *value)" --><p>
+<a class="anchor" name="56885d576d38f8fbffce10834e892117"></a><!-- doxytag: member="xml.h::stp_xmlstrtol" ref="56885d576d38f8fbffce10834e892117" args="(const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -581,7 +595,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a8"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="a8" args="(const char *value)" --><p>
+<a class="anchor" name="9d7f6cba6d4f5b8b01b6d3c192d10596"></a><!-- doxytag: member="xml.h::stp_xmlstrtoul" ref="9d7f6cba6d4f5b8b01b6d3c192d10596" args="(const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -609,7 +623,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="a20" args="(const stp_array_t *array)" --><p>
+<a class="anchor" name="90e7cdadf10d6492082fd008b79853b0"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_array" ref="90e7cdadf10d6492082fd008b79853b0" args="(const stp_array_t *array)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -617,7 +631,7 @@ XML tree functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_array           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#ga0">stp_array_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__array.html#g69e0971771118ccea2a5dc72ba4fa73e">stp_array_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>array</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -637,7 +651,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="a18" args="(const stp_curve_t *curve)" --><p>
+<a class="anchor" name="286050c77ae8ee255a7b6035b88d5fb4"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_curve" ref="286050c77ae8ee255a7b6035b88d5fb4" args="(const stp_curve_t *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -645,7 +659,7 @@ XML tree functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_curve           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#ga0">stp_curve_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__curve.html#gd5ce135b7af2c6e79bae493c7055461d">stp_curve_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>curve</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -665,7 +679,7 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="a16" args="(const stp_sequence_t *seq)" --><p>
+<a class="anchor" name="134d8ffe83aa1bc29ca65869af337479"></a><!-- doxytag: member="xml.h::stp_xmltree_create_from_sequence" ref="134d8ffe83aa1bc29ca65869af337479" args="(const stp_sequence_t *seq)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -673,7 +687,7 @@ XML tree functions.
         <tr>
           <td class="md" nowrap valign="top"><a class="el" href="structstp__mxml__node__s.html">stp_mxml_node_t</a>* stp_xmltree_create_from_sequence           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#ga0">stp_sequence_t</a> *&nbsp;</td>
+          <td class="md" nowrap valign="top">const <a class="el" href="group__sequence.html#gb3d4cae653c4303a6e5d26b516694c92">stp_sequence_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>seq</em>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -693,8 +707,8 @@ XML tree functions.
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprint API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:33 2005 for libgutenprint API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/gutenprintui2.tag b/doc/gutenprintui2/gutenprintui2.tag
index f1bbaac..44aed60 100644
--- a/doc/gutenprintui2/gutenprintui2.tag
+++ b/doc/gutenprintui2/gutenprintui2.tag
@@ -2,7 +2,7 @@
 <tagfile>
   <compound kind="file">
     <name>curve.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprintui2/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
     <filename>curve_8h</filename>
     <class kind="struct">_StpuiCurve</class>
     <class kind="struct">_StpuiCurveClass</class>
@@ -10,138 +10,138 @@
       <type>#define</type>
       <name>STPUI_TYPE_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>5795444c0586277d34c693fc7b5deae0</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>767d8cf354306a35dc6b53e2aa033aa6</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>9a1005d0077d10338a6a7f16940e8233</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_CURVE</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>e886ed1f007a40362f784d16c020ff40</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_CURVE_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>fc44896a3decd9b178cec7f90598c8b8</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_CURVE_GET_CLASS</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>5995f171eca6b87af06afde3160fcac0</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiCurve</type>
       <name>StpuiCurve</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>04ae3b4e227fca5f2aa871b0f9e1cab0</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiCurveClass</type>
       <name>StpuiCurveClass</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>13e6043625efd88837615685f7472e2d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>StpuiCurveType</name>
-      <anchor>a19</anchor>
+      <anchor>7d44faf53d74002f61d5805ac34d968e</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_LINEAR</name>
-      <anchor>a19a8</anchor>
+      <anchor>7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_SPLINE</name>
-      <anchor>a19a9</anchor>
+      <anchor>7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>STPUI_CURVE_TYPE_FREE</name>
-      <anchor>a19a10</anchor>
+      <anchor>7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_curve_get_type</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>3eafd87334a70bb87fca2084b558c2b2</anchor>
       <arglist>(void) G_GNUC_CONST</arglist>
     </member>
     <member kind="function">
       <type>GtkWidget *</type>
       <name>stpui_curve_new</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>23667321d3acf52249e8c18506be017d</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_reset</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>eb1c0e9894aaa04ade62d050aa5ea15b</anchor>
       <arglist>(StpuiCurve *curve)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_gamma</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>2b8cf1c1a6badf89c3a7b95c87b91a72</anchor>
       <arglist>(StpuiCurve *curve, gfloat gamma_)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_range</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>3701325c36b957b91b5e2719ffbaa28a</anchor>
       <arglist>(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_get_vector</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>6dfbda8721d6d652ef8f710a696d6367</anchor>
       <arglist>(StpuiCurve *curve, int veclen, gfloat vector[])</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_vector</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>f611be61b641f4efc9b6044aacf98103</anchor>
       <arglist>(StpuiCurve *curve, int veclen, const gfloat vector[])</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_curve_set_curve_type</name>
       <anchorfile>curve_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>9d6d8e461caf28083c2e1b76639c7d24</anchor>
       <arglist>(StpuiCurve *curve, StpuiCurveType type)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gammacurve.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprintui2/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
     <filename>gammacurve_8h</filename>
     <class kind="struct">_StpuiGammaCurve</class>
     <class kind="struct">_StpuiGammaCurveClass</class>
@@ -149,76 +149,76 @@
       <type>#define</type>
       <name>STPUI_TYPE_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>2575918538735bd891f2e4d9ec05d7b1</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>679501caed595f5d700271b9991b724f</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>8272afcf9ea42c3823c2d201fa13ba39</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_GAMMA_CURVE</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>3838127029e05b8b71b4bb177ae8212e</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_IS_GAMMA_CURVE_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>c574b30d0e65b8f5f6cd110405cbe9fb</anchor>
       <arglist>(klass)</arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_GAMMA_CURVE_GET_CLASS</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>9d8fed0608357a55c11c5adba1f6d1b5</anchor>
       <arglist>(obj)</arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiGammaCurve</type>
       <name>StpuiGammaCurve</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a6</anchor>
+      <anchor>e112dc0cc75594e7e8efd332fe2c9c5b</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>_StpuiGammaCurveClass</type>
       <name>StpuiGammaCurveClass</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a7</anchor>
+      <anchor>4ab4956b6af215068a2592a98ae43cbc</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_gamma_curve_get_type</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a8</anchor>
+      <anchor>57a0864588671f9b1ed5a64be3a06ed5</anchor>
       <arglist>(void) G_GNUC_CONST</arglist>
     </member>
     <member kind="function">
       <type>GtkWidget *</type>
       <name>stpui_gamma_curve_new</name>
       <anchorfile>gammacurve_8h.html</anchorfile>
-      <anchor>a9</anchor>
+      <anchor>b3038f4fe63c6035e3f1ec876559d8f9</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>gutenprintui.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprintui2/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
     <filename>gutenprintui_8h</filename>
     <includes id="curve_8h" name="curve.h" local="no" imported="no">gutenprintui2/curve.h</includes>
     <includes id="gammacurve_8h" name="gammacurve.h" local="no" imported="no">gutenprintui2/gammacurve.h</includes>
@@ -229,475 +229,475 @@
       <type>stpui_image</type>
       <name>stpui_image_t</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>f0f2e236d924323378ded67b3e434dd5</anchor>
       <arglist></arglist>
     </member>
     <member kind="typedef">
       <type>guchar *(*</type>
       <name>get_thumbnail_func_t</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>6867fbda8dc5650678af5a23979386b8</anchor>
       <arglist>)(void *data, gint *width, gint *height, gint *bpp, gint page)</arglist>
     </member>
     <member kind="enumeration">
       <name>orient_t</name>
-      <anchor>a62</anchor>
+      <anchor>b72dd018d9f09ee35f7ac40fc7f29593</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_AUTO</name>
-      <anchor>a62a2</anchor>
+      <anchor>b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_PORTRAIT</name>
-      <anchor>a62a3</anchor>
+      <anchor>b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_LANDSCAPE</name>
-      <anchor>a62a4</anchor>
+      <anchor>b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_UPSIDEDOWN</name>
-      <anchor>a62a5</anchor>
+      <anchor>b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>ORIENT_SEASCAPE</name>
-      <anchor>a62a6</anchor>
+      <anchor>b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumeration">
       <name>command_t</name>
-      <anchor>a63</anchor>
+      <anchor>1d9b1ad69ddba33dc7f51bf85792777d</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_DEFAULT</name>
-      <anchor>a63a7</anchor>
+      <anchor>1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_CUSTOM</name>
-      <anchor>a63a8</anchor>
+      <anchor>1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda</anchor>
       <arglist></arglist>
     </member>
     <member kind="enumvalue">
       <name>COMMAND_TYPE_FILE</name>
-      <anchor>a63a9</anchor>
+      <anchor>1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a10</anchor>
+      <anchor>8ad3d342e15a406c942d52a7d5e093b8</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_name_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a11</anchor>
+      <anchor>ad9fc64007c7867e05743b6a30664fc4</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a12</anchor>
+      <anchor>c70ee1c3425b1a3be74a5dfc3476f079</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_queue_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a13</anchor>
+      <anchor>8267cf35fd86b40ce1bddb958bc0828d</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_queue_name_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a14</anchor>
+      <anchor>7b54207ec204cbe3327284ac9d56b188</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_queue_name</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a15</anchor>
+      <anchor>aecb54cd0535976fd51b2be080366c22</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_output_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a16</anchor>
+      <anchor>e0e2a359527aded6f2dc60fe6ec5ff55</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_output_filename_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a17</anchor>
+      <anchor>8a751b01cba31f15aed8f39ef72f8e37</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_output_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a18</anchor>
+      <anchor>f593816f98fad12bf48d461fe72ff31e</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_extra_printer_options</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a19</anchor>
+      <anchor>6fba852c389ed20d9d1da1610d3125db</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_extra_printer_options_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a20</anchor>
+      <anchor>b63f9f05403aa8edd3fc9a063d558a88</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_extra_printer_options</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a21</anchor>
+      <anchor>6b83f5dbcdf2deeef19726e468d7cfe3</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_custom_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a22</anchor>
+      <anchor>5f04be99f3a2d8d788bd929d01823a75</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_custom_command_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a23</anchor>
+      <anchor>13c2730e5161bf18e3a31fe4d2bb0b31</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_custom_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a24</anchor>
+      <anchor>b31d172f0c6755ac149b498800c46141</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_copy_count</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a25</anchor>
+      <anchor>3252b3c283aca1a71da38ae9a7b9b9b5</anchor>
       <arglist>(stpui_plist_t *p, gint count)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_plist_get_copy_count</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a26</anchor>
+      <anchor>4effa689c6a5e828c672b3feb0c91623</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_current_standard_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a27</anchor>
+      <anchor>c1e81fe45a8a3b4a6cd2682cdc21ddd1</anchor>
       <arglist>(stpui_plist_t *p, const char *val)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_current_standard_command_n</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a28</anchor>
+      <anchor>8f7fe530f483f07c08dbe81efebbdb7a</anchor>
       <arglist>(stpui_plist_t *p, const char *val, int n)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_plist_get_current_standard_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a29</anchor>
+      <anchor>276c7fbf168c1431d8dce2f1393dac09</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_set_command_type</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a30</anchor>
+      <anchor>b3cfd6a8b492bda54150c716f1631b4f</anchor>
       <arglist>(stpui_plist_t *p, command_t val)</arglist>
     </member>
     <member kind="function">
       <type>command_t</type>
       <name>stpui_plist_get_command_type</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a31</anchor>
+      <anchor>2f5b046cd01c6ad5bbccd485165928d7</anchor>
       <arglist>(const stpui_plist_t *p)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_global_parameter</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a32</anchor>
+      <anchor>35603794767eb756a784a74220e2e0cb</anchor>
       <arglist>(const char *param, const char *value)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_get_global_parameter</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a33</anchor>
+      <anchor>51decc80a312291c9f99cde8a18393a6</anchor>
       <arglist>(const char *param)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_plist_copy</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a34</anchor>
+      <anchor>a41fef36c0775105b3187708dbd9700a</anchor>
       <arglist>(stpui_plist_t *vd, const stpui_plist_t *vs)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_plist_add</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a35</anchor>
+      <anchor>9b28f7223268ab81ff605e733ebf97e5</anchor>
       <arglist>(const stpui_plist_t *key, int add_only)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printer_initialize</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a36</anchor>
+      <anchor>63325efb553d690c83608ad9d75b9c5c</anchor>
       <arglist>(stpui_plist_t *printer)</arglist>
     </member>
     <member kind="function">
       <type>const stpui_plist_t *</type>
       <name>stpui_get_current_printer</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a37</anchor>
+      <anchor>8aa89d084c3364396974b7665f5a26f9</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>char *</type>
       <name>stpui_build_standard_print_command</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a38</anchor>
+      <anchor>e63acdc3a4074290111bb1cece4437a1</anchor>
       <arglist>(const stpui_plist_t *plist, const stp_printer_t *printer)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_printrc_file</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a39</anchor>
+      <anchor>98928c6f53a0322dad08f1057882b2fd</anchor>
       <arglist>(const char *name)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_get_printrc_file</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a40</anchor>
+      <anchor>47f72a1bf50eac641ab4f72af5ed379f</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printrc_load</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a41</anchor>
+      <anchor>9768d9e8d5370bdd66710de1df8fe4d3</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_get_system_printers</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a42</anchor>
+      <anchor>35da543417b8be45c11c02c590bf4ef5</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_printrc_save</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a43</anchor>
+      <anchor>ea786257cd4a43a3ab947eb09d19907c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a44</anchor>
+      <anchor>849dc9d8235aeae8c294ea97d3a2291d</anchor>
       <arglist>(const char *)</arglist>
     </member>
     <member kind="function">
       <type>const char *</type>
       <name>stpui_get_image_filename</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a45</anchor>
+      <anchor>b46b5187c4d36188019c556f8685efdc</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_errfunc</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a46</anchor>
+      <anchor>cedc4d703e8a6e88243241245748a144</anchor>
       <arglist>(stp_outfunc_t wfunc)</arglist>
     </member>
     <member kind="function">
       <type>stp_outfunc_t</type>
       <name>stpui_get_errfunc</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a47</anchor>
+      <anchor>92ac2b023b0352cb3d519ece77ccc51c</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_errdata</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a48</anchor>
+      <anchor>6bc23edc145044cffc5f9457f759523e</anchor>
       <arglist>(void *errdata)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stpui_get_errdata</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a49</anchor>
+      <anchor>1280f5bad08d4f7ccbfbd64785102ce2</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>gint</type>
       <name>stpui_do_print_dialog</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a50</anchor>
+      <anchor>b6ff540cc47781f92bd98d11c609ad96</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>gint</type>
       <name>stpui_compute_orientation</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a51</anchor>
+      <anchor>25b010dc52c84c5dc5a83b84c4973415</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_dimensions</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a52</anchor>
+      <anchor>c064fde3bd665a169a5bcee426fe90ad</anchor>
       <arglist>(gint width, gint height)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_resolution</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a53</anchor>
+      <anchor>58f2ba3797c5bed1328f2bac2aa71531</anchor>
       <arglist>(gdouble xres, gdouble yres)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_type</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a54</anchor>
+      <anchor>310705e065d4ae1b3ed2e1c9c5189b1b</anchor>
       <arglist>(const char *image_type)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_raw_channels</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a55</anchor>
+      <anchor>9475be2668e339e552bf905b3b377697</anchor>
       <arglist>(gint channels)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_image_channel_depth</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a56</anchor>
+      <anchor>121e36a0905706f7af20b18d76723086</anchor>
       <arglist>(gint bit_depth)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_thumbnail_func</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a57</anchor>
+      <anchor>881c586fa5ec944b157b7cb92c05be7a</anchor>
       <arglist>(get_thumbnail_func_t)</arglist>
     </member>
     <member kind="function">
       <type>get_thumbnail_func_t</type>
       <name>stpui_get_thumbnail_func</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a58</anchor>
+      <anchor>e2ae7063801902cb0a4168974d81ab9b</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>void</type>
       <name>stpui_set_thumbnail_data</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a59</anchor>
+      <anchor>da2af8cf724e3bcbd49be2f5d1cd4bc2</anchor>
       <arglist>(void *)</arglist>
     </member>
     <member kind="function">
       <type>void *</type>
       <name>stpui_get_thumbnail_data</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a60</anchor>
+      <anchor>eeca67486b0fae3eae3ed8d4c8b6ebe1</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>int</type>
       <name>stpui_print</name>
       <anchorfile>gutenprintui_8h.html</anchorfile>
-      <anchor>a61</anchor>
+      <anchor>7867f0a4ea47e5f9f80c3463e6029a8a</anchor>
       <arglist>(const stpui_plist_t *printer, stpui_image_t *im)</arglist>
     </member>
   </compound>
   <compound kind="file">
     <name>typebuiltins.h</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprintui2/</path>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
     <filename>typebuiltins_8h</filename>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_ORIENT_T</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a0</anchor>
+      <anchor>b188f6f607a7c274ff9b93a7b9183c92</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_COMMAND_T</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a1</anchor>
+      <anchor>c556621db9092f28e345b98cb6db57e3</anchor>
       <arglist></arglist>
     </member>
     <member kind="define">
       <type>#define</type>
       <name>STPUI_TYPE_CURVE_TYPE</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a2</anchor>
+      <anchor>fd1aa89f9f88935e1482fa6675a28ee1</anchor>
       <arglist></arglist>
     </member>
     <member kind="function">
       <type>G_BEGIN_DECLS GType</type>
       <name>orient_t_orient_t_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a3</anchor>
+      <anchor>2c321ec10322da403b1709b4a8956ee3</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>command_t_command_t_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a4</anchor>
+      <anchor>43d1612dab4df6c31f9b5362f88eaadf</anchor>
       <arglist>(void)</arglist>
     </member>
     <member kind="function">
       <type>GType</type>
       <name>stpui_curve_type_get_type</name>
       <anchorfile>typebuiltins_8h.html</anchorfile>
-      <anchor>a5</anchor>
+      <anchor>5e570d0225cd4f8ef426d648293dced9</anchor>
       <arglist>(void)</arglist>
     </member>
   </compound>
@@ -708,105 +708,105 @@
       <type>GtkDrawingArea</type>
       <name>graph</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>f8b0b924ebd7046dbfa85a856e4682c8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>cursor_type</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>aeb92d99e85efb4bafc8170ff337d9a5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>min_x</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>42911f1fe1166d1441b07b5df42cc5c8</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>max_x</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>2cc8505f392b3757b8e289d83c321693</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>min_y</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>6557fd2c11b2f6a56a5ab6bbb85cbc19</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>max_y</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>2c34fcda6babf4933d253ae6cd7c9419</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GdkPixmap *</type>
       <name>pixmap</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>8580443f4197aa43eeb23b41f3984de3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>StpuiCurveType</type>
       <name>curve_type</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>a15d0c7b1a08ed0fb3e8675f60ceeb63</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>height</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>b435e227d5dd201e1768b2bcb2e0aa81</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>grab_point</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>87568e046fdaaa74725653dc4de489fb</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>last</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>98bd1c45684cf587ac2347a92dd7bb51</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>num_points</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o11</anchor>
+      <anchor>041da0cf21a17db4fedb8045c0eacdb3</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GdkPoint *</type>
       <name>point</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o12</anchor>
+      <anchor>78ee54aa8f813885fe2fe20d232518b9</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gint</type>
       <name>num_ctlpoints</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o13</anchor>
+      <anchor>7268e58fecac8344b32a31da68b341ec</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>gfloat(*</type>
       <name>ctlpoint</name>
       <anchorfile>struct__StpuiCurve.html</anchorfile>
-      <anchor>o14</anchor>
+      <anchor>b4de71fdc43c7448028e425034663828</anchor>
       <arglist>)[2]</arglist>
     </member>
   </compound>
@@ -817,42 +817,42 @@
       <type>GtkDrawingAreaClass</type>
       <name>parent_class</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>30b4ac9159b3909d53a2913e9d33ce37</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>curve_type_changed</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>bd4d748a3214fe60405dd0f19071963c</anchor>
       <arglist>)(StpuiCurve *curve)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved1</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>858c3bfbf2316dff67461668960ea424</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved2</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>b98e90cf60128ee094ed5cbec3f7b9bd</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved3</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>3a79f396911263c8c1c03ead4a6feecf</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved4</name>
       <anchorfile>struct__StpuiCurveClass.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>43708b729750b48f02a0273f72cb8947</anchor>
       <arglist>)(void)</arglist>
     </member>
   </compound>
@@ -863,49 +863,49 @@
       <type>GtkVBox</type>
       <name>vbox</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>fad9b4ea6fda50ab90f21ab8d4b6b70c</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>table</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>aab9e1de16f38176f86d7a92ba337a8d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>curve</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>4efa264f5ef3e1a5c95736e07544ebf0</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>button</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>f40e80ae3d6e7d34a12bf5c9d58c140b</anchor>
       <arglist>[5]</arglist>
     </member>
     <member kind="variable">
       <type>gfloat</type>
       <name>gamma</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>05b048d7242cb7b8b57cfa3b1d65ecea</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>gamma_dialog</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>8dadefcd22adf55ea28403e900b2329e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>GtkWidget *</type>
       <name>gamma_text</name>
       <anchorfile>struct__StpuiGammaCurve.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>5b7be56d829006b2914afe741e75a31e</anchor>
       <arglist></arglist>
     </member>
   </compound>
@@ -916,35 +916,35 @@
       <type>GtkVBoxClass</type>
       <name>parent_class</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>30b4ac9159b3909d53a2913e9d33ce37</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved1</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>858c3bfbf2316dff67461668960ea424</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved2</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>b98e90cf60128ee094ed5cbec3f7b9bd</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved3</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>3a79f396911263c8c1c03ead4a6feecf</anchor>
       <arglist>)(void)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>_gtk_reserved4</name>
       <anchorfile>struct__StpuiGammaCurveClass.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>43708b729750b48f02a0273f72cb8947</anchor>
       <arglist>)(void)</arglist>
     </member>
   </compound>
@@ -955,56 +955,56 @@
       <type>stp_image_t</type>
       <name>im</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>73bebce395b6f1efedcf6842fbdb4d76</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>transpose</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>2eab557840c9b342f902b27b6f4374c5</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>hflip</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>59c4e5062d0201345d9a3c517faed76b</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>vflip</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>5a79d8a51117f0f542de337737559e35</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_ccw</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>2dd5e7759fa1a528d7d609558f9a3af9</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_cw</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>2f391913505ad8be5f120fdc15083631</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>rotate_180</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>38ffe38f14b789767f8a2f7823ad665f</anchor>
       <arglist>)(struct stpui_image *image)</arglist>
     </member>
     <member kind="variable">
       <type>void(*</type>
       <name>crop</name>
       <anchorfile>structstpui__image.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>6746aa4c8378f9674566fbefb37a6aa7</anchor>
       <arglist>)(struct stpui_image *image, int left, int top, int right, int bottom)</arglist>
     </member>
   </compound>
@@ -1015,98 +1015,98 @@
       <type>char *</type>
       <name>name</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o0</anchor>
+      <anchor>b068931cc450442b63f5b3d276ea4297</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>command_t</type>
       <name>command_type</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o1</anchor>
+      <anchor>193b6cc04eadeb71b71417bf19c48c4c</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>queue_name</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o2</anchor>
+      <anchor>692e12dd54ad3badf18627bdb1784843</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>extra_printer_options</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o3</anchor>
+      <anchor>41633c85d02d5b0157efadd6414fa77e</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>custom_command</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o4</anchor>
+      <anchor>4ea7b75bdeda81e50ea3cd316b341f41</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>current_standard_command</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o5</anchor>
+      <anchor>d7d54f45247db317b37d0a4a1b4fc3d2</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>char *</type>
       <name>output_filename</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o6</anchor>
+      <anchor>9c39e63596d53eb17161a43fce627940</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>float</type>
       <name>scaling</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o7</anchor>
+      <anchor>0ad29dfafe3dc8ad331b9397912e3d4d</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>orient_t</type>
       <name>orientation</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o8</anchor>
+      <anchor>da1639422ad8f355d2371428471379b5</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>unit</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o9</anchor>
+      <anchor>3e34bdebd9bd5edda27e8728904a2552</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>auto_size_roll_feed_paper</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o10</anchor>
+      <anchor>b679b17522d3fbb138dad90635cb91f7</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>int</type>
       <name>invalid_mask</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o11</anchor>
+      <anchor>01f4a6c8919018e9df44948ed78a5f71</anchor>
       <arglist></arglist>
     </member>
     <member kind="variable">
       <type>stp_vars_t *</type>
       <name>v</name>
       <anchorfile>structstpui__plist__t.html</anchorfile>
-      <anchor>o12</anchor>
+      <anchor>9e3669d19b675bd57058fd4664205d2a</anchor>
       <arglist></arglist>
     </member>
   </compound>
   <compound kind="dir">
     <name>include/gutenprintui2/</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/gutenprintui2/</path>
-    <filename>dir_000001.html</filename>
+    <path>/home/rleigh/gutenprint-debian-dist/include/gutenprintui2/</path>
+    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html</filename>
     <file>curve.h</file>
     <file>gammacurve.h</file>
     <file>gutenprintui.h</file>
@@ -1114,8 +1114,8 @@
   </compound>
   <compound kind="dir">
     <name>include/</name>
-    <path>/home/rlk/sandbox/print-4.3.new/include/</path>
-    <filename>dir_000000.html</filename>
+    <path>/home/rleigh/gutenprint-debian-dist/include/</path>
+    <filename>dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html</filename>
     <dir>include/gutenprintui2/</dir>
   </compound>
 </tagfile>
diff --git a/doc/gutenprintui2/html/annotated.html b/doc/gutenprintui2/html/annotated.html
index c3124c2..b7d6fbc 100644
--- a/doc/gutenprintui2/html/annotated.html
+++ b/doc/gutenprintui2/html/annotated.html
@@ -2,9 +2,22 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Structures</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindexHL" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>libgutenprintui2 API Reference Data Structures</h1>Here are the data structures with brief descriptions:<table>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td><td class="indexvalue"></td></tr>
@@ -13,8 +26,8 @@
   <tr><td class="indexkey"><a class="el" href="structstpui__image.html">stpui_image</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey"><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/classes.html b/doc/gutenprintui2/html/classes.html
index 4c1e5c0..523be6c 100644
--- a/doc/gutenprintui2/html/classes.html
+++ b/doc/gutenprintui2/html/classes.html
@@ -2,16 +2,29 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Alphabetical List</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindexHL" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<h1>libgutenprintui2 API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter__">_</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
+<h1>libgutenprintui2 API Reference Data Structure Index</h1><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
 <table align="center" width="95%" border="0" cellspacing="0" cellpadding="0">
-<tr><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
-</td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
-</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter__">_</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a></div><p>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<tr><td><a name="letter_S"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;S&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="structstpui__plist__t.html">stpui_plist_t</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter__"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;_&nbsp;&nbsp;</div></td></tr></table>
+</td><td><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter__">_</a></div><p>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/curve_8h.html b/doc/gutenprintui2/html/curve_8h.html
index ddb9ed2..a63afb3 100644
--- a/doc/gutenprintui2/html/curve_8h.html
+++ b/doc/gutenprintui2/html/curve_8h.html
@@ -2,11 +2,23 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/curve.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a></div>
 <h1>curve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
 <code>#include &lt;gtk/gtkdrawingarea.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -17,49 +29,49 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a0">STPUI_TYPE_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_get_type ())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#5795444c0586277d34c693fc7b5deae0">STPUI_TYPE_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_get_type ())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a1">STPUI_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#767d8cf354306a35dc6b53e2aa033aa6">STPUI_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurve.html">StpuiCurve</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a2">STPUI_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#9a1005d0077d10338a6a7f16940e8233">STPUI_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a3">STPUI_IS_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#e886ed1f007a40362f784d16c020ff40">STPUI_IS_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a4">STPUI_IS_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#fc44896a3decd9b178cec7f90598c8b8">STPUI_IS_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a5">STPUI_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#5995f171eca6b87af06afde3160fcac0">STPUI_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_CURVE, <a class="el" href="struct__StpuiCurveClass.html">StpuiCurveClass</a>))</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a6">StpuiCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurve.html">_StpuiCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#04ae3b4e227fca5f2aa871b0f9e1cab0">StpuiCurve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a7">StpuiCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiCurveClass.html">_StpuiCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#13e6043625efd88837615685f7472e2d">StpuiCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a19">StpuiCurveType</a> { <a class="el" href="curve_8h.html#a19a8">STPUI_CURVE_TYPE_LINEAR</a>, 
-<a class="el" href="curve_8h.html#a19a9">STPUI_CURVE_TYPE_SPLINE</a>, 
-<a class="el" href="curve_8h.html#a19a10">STPUI_CURVE_TYPE_FREE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a> { <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297">STPUI_CURVE_TYPE_LINEAR</a>, 
+<a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06">STPUI_CURVE_TYPE_SPLINE</a>, 
+<a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da">STPUI_CURVE_TYPE_FREE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a11">stpui_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#3eafd87334a70bb87fca2084b558c2b2">stpui_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a12">stpui_curve_new</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#23667321d3acf52249e8c18506be017d">stpui_curve_new</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a13">stpui_curve_reset</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#eb1c0e9894aaa04ade62d050aa5ea15b">stpui_curve_reset</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a14">stpui_curve_set_gamma</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat gamma_)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#2b8cf1c1a6badf89c3a7b95c87b91a72">stpui_curve_set_gamma</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat gamma_)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a15">stpui_curve_set_range</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#3701325c36b957b91b5e2719ffbaa28a">stpui_curve_set_range</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a16">stpui_curve_get_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, gfloat vector[])</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#6dfbda8721d6d652ef8f710a696d6367">stpui_curve_get_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, gfloat vector[])</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a17">stpui_curve_set_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, const gfloat vector[])</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#f611be61b641f4efc9b6044aacf98103">stpui_curve_set_vector</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, int veclen, const gfloat vector[])</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#a18">stpui_curve_set_curve_type</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, <a class="el" href="curve_8h.html#a19">StpuiCurveType</a> type)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="curve_8h.html#9d6d8e461caf28083c2e1b76639c7d24">stpui_curve_set_curve_type</a> (<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve, <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a> type)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="a1" args="(obj)" --><p>
+<a class="anchor" name="767d8cf354306a35dc6b53e2aa033aa6"></a><!-- doxytag: member="curve.h::STPUI_CURVE" ref="767d8cf354306a35dc6b53e2aa033aa6" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -87,7 +99,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="a2" args="(klass)" --><p>
+<a class="anchor" name="9a1005d0077d10338a6a7f16940e8233"></a><!-- doxytag: member="curve.h::STPUI_CURVE_CLASS" ref="9a1005d0077d10338a6a7f16940e8233" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -115,7 +127,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="a5" args="(obj)" --><p>
+<a class="anchor" name="5995f171eca6b87af06afde3160fcac0"></a><!-- doxytag: member="curve.h::STPUI_CURVE_GET_CLASS" ref="5995f171eca6b87af06afde3160fcac0" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -143,7 +155,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="a3" args="(obj)" --><p>
+<a class="anchor" name="e886ed1f007a40362f784d16c020ff40"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE" ref="e886ed1f007a40362f784d16c020ff40" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -171,7 +183,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="a4" args="(klass)" --><p>
+<a class="anchor" name="fc44896a3decd9b178cec7f90598c8b8"></a><!-- doxytag: member="curve.h::STPUI_IS_CURVE_CLASS" ref="fc44896a3decd9b178cec7f90598c8b8" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -199,7 +211,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="a0" args="" --><p>
+<a class="anchor" name="5795444c0586277d34c693fc7b5deae0"></a><!-- doxytag: member="curve.h::STPUI_TYPE_CURVE" ref="5795444c0586277d34c693fc7b5deae0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -223,7 +235,7 @@
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a6"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="a6" args="" --><p>
+<a class="anchor" name="04ae3b4e227fca5f2aa871b0f9e1cab0"></a><!-- doxytag: member="curve.h::StpuiCurve" ref="04ae3b4e227fca5f2aa871b0f9e1cab0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -246,7 +258,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="a7" args="" --><p>
+<a class="anchor" name="13e6043625efd88837615685f7472e2d"></a><!-- doxytag: member="curve.h::StpuiCurveClass" ref="13e6043625efd88837615685f7472e2d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -270,13 +282,13 @@
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a19"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="a19" args="" --><p>
+<a class="anchor" name="7d44faf53d74002f61d5805ac34d968e"></a><!-- doxytag: member="curve.h::StpuiCurveType" ref="7d44faf53d74002f61d5805ac34d968e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="curve_8h.html#a19">StpuiCurveType</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a>          </td>
         </tr>
       </table>
     </td>
@@ -292,11 +304,11 @@
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a19a8"></a><!-- doxytag: member="STPUI_CURVE_TYPE_LINEAR" ref="a19a8" args="" -->STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297"></a><!-- doxytag: member="STPUI_CURVE_TYPE_LINEAR" ref="7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297" args="" -->STPUI_CURVE_TYPE_LINEAR</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a19a9"></a><!-- doxytag: member="STPUI_CURVE_TYPE_SPLINE" ref="a19a9" args="" -->STPUI_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06"></a><!-- doxytag: member="STPUI_CURVE_TYPE_SPLINE" ref="7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06" args="" -->STPUI_CURVE_TYPE_SPLINE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a19a10"></a><!-- doxytag: member="STPUI_CURVE_TYPE_FREE" ref="a19a10" args="" -->STPUI_CURVE_TYPE_FREE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da"></a><!-- doxytag: member="STPUI_CURVE_TYPE_FREE" ref="7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da" args="" -->STPUI_CURVE_TYPE_FREE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -304,7 +316,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a11"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="a11" args="(void) G_GNUC_CONST" --><p>
+<a class="anchor" name="3eafd87334a70bb87fca2084b558c2b2"></a><!-- doxytag: member="curve.h::stpui_curve_get_type" ref="3eafd87334a70bb87fca2084b558c2b2" args="(void) G_GNUC_CONST" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -332,7 +344,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="a16" args="(StpuiCurve *curve, int veclen, gfloat vector[])" --><p>
+<a class="anchor" name="6dfbda8721d6d652ef8f710a696d6367"></a><!-- doxytag: member="curve.h::stpui_curve_get_vector" ref="6dfbda8721d6d652ef8f710a696d6367" args="(StpuiCurve *curve, int veclen, gfloat vector[])" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -375,7 +387,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="a12" args="(void)" --><p>
+<a class="anchor" name="23667321d3acf52249e8c18506be017d"></a><!-- doxytag: member="curve.h::stpui_curve_new" ref="23667321d3acf52249e8c18506be017d" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -403,7 +415,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="a13" args="(StpuiCurve *curve)" --><p>
+<a class="anchor" name="eb1c0e9894aaa04ade62d050aa5ea15b"></a><!-- doxytag: member="curve.h::stpui_curve_reset" ref="eb1c0e9894aaa04ade62d050aa5ea15b" args="(StpuiCurve *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -431,7 +443,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="a18" args="(StpuiCurve *curve, StpuiCurveType type)" --><p>
+<a class="anchor" name="9d6d8e461caf28083c2e1b76639c7d24"></a><!-- doxytag: member="curve.h::stpui_curve_set_curve_type" ref="9d6d8e461caf28083c2e1b76639c7d24" args="(StpuiCurve *curve, StpuiCurveType type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -445,7 +457,7 @@
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="curve_8h.html#a19">StpuiCurveType</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>type</em></td>
         </tr>
         <tr>
@@ -468,7 +480,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="a14" args="(StpuiCurve *curve, gfloat gamma_)" --><p>
+<a class="anchor" name="2b8cf1c1a6badf89c3a7b95c87b91a72"></a><!-- doxytag: member="curve.h::stpui_curve_set_gamma" ref="2b8cf1c1a6badf89c3a7b95c87b91a72" args="(StpuiCurve *curve, gfloat gamma_)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -505,7 +517,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="curve.h::stpui_curve_set_range" ref="a15" args="(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)" --><p>
+<a class="anchor" name="3701325c36b957b91b5e2719ffbaa28a"></a><!-- doxytag: member="curve.h::stpui_curve_set_range" ref="3701325c36b957b91b5e2719ffbaa28a" args="(StpuiCurve *curve, gfloat min_x, gfloat max_x, gfloat min_y, gfloat max_y)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -560,7 +572,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="curve.h::stpui_curve_set_vector" ref="a17" args="(StpuiCurve *curve, int veclen, const gfloat vector[])" --><p>
+<a class="anchor" name="f611be61b641f4efc9b6044aacf98103"></a><!-- doxytag: member="curve.h::stpui_curve_set_vector" ref="f611be61b641f4efc9b6044aacf98103" args="(StpuiCurve *curve, int veclen, const gfloat vector[])" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -603,8 +615,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dir_000000.html b/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html
index 9db3ff4..648a8ae 100644
--- a/doc/gutenprintui2/html/dir_000000.html
+++ b/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html
@@ -2,19 +2,26 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: include/ Directory Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a></div>
 <h1>include Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Directories</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir_000001.html">gutenprintui2</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">directory &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a></td></tr>
 
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dir_000001.html b/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html
index a3fbf03..b8901a1 100644
--- a/doc/gutenprintui2/html/dir_000001.html
+++ b/doc/gutenprintui2/html/dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html
@@ -2,11 +2,18 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/ Directory Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a></div>
 <h1>gutenprintui2 Directory Reference</h1><table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Files</h2></td></tr>
@@ -19,8 +26,8 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">file &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td></tr>
 
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/dirs.html b/doc/gutenprintui2/html/dirs.html
index d6ceb64..d1fcad6 100644
--- a/doc/gutenprintui2/html/dirs.html
+++ b/doc/gutenprintui2/html/dirs.html
@@ -2,17 +2,24 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Directory Hierarchy</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindexHL" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li id="current"><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
 <h1>libgutenprintui2 API Reference Directories</h1>This directory hierarchy is sorted roughly, but not completely, alphabetically:<ul>
-<li><a class="el" href="dir_000000.html">include</a>
+<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>
 <ul>
-<li><a class="el" href="dir_000001.html">gutenprintui2</a>
+<li><a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a>
 </ul>
 </ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/doxygen.css b/doc/gutenprintui2/html/doxygen.css
index decae9e..05615b2 100644
--- a/doc/gutenprintui2/html/doxygen.css
+++ b/doc/gutenprintui2/html/doxygen.css
@@ -17,8 +17,8 @@ H3 {
 CAPTION { font-weight: bold }
 DIV.qindex {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
@@ -26,16 +26,16 @@ DIV.qindex {
 }
 DIV.nav {
 	width: 100%;
-	background-color: #eeeeff;
-	border: 1px solid #b0b0b0;
+	background-color: #e8eef2;
+	border: 1px solid #84b0c7;
 	text-align: center;
 	margin: 2px;
 	padding: 2px;
 	line-height: 140%;
 }
 DIV.navtab {
-       background-color: #eeeeff;
-       border: 1px solid #b0b0b0;
+       background-color: #e8eef2;
+       border: 1px solid #84b0c7;
        text-align: center;
        margin: 2px;
        margin-right: 15px;
@@ -118,7 +118,7 @@ BODY {
 	margin-left: 20px;
 }
 TD.indexkey {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-weight: bold;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -131,7 +131,7 @@ TD.indexkey {
 	border: 1px solid #CCCCCC;
 }
 TD.indexvalue {
-	background-color: #eeeeff;
+	background-color: #e8eef2;
 	font-style: italic;
 	padding-right  : 10px;
 	padding-top    : 2px;
@@ -286,24 +286,25 @@ FORM.search {
 INPUT.search { font-size: 75%;
                color: #000080;
                font-weight: normal;
-               background-color: #eeeeff;
+               background-color: #e8eef2;
 }
 TD.tiny      { font-size: 75%;
 }
 a {
-	color: #252E78;
+	color: #1A41A8;
 }
 a:visited {
-	color: #3D2185;
+	color: #2A3798;
 }
 .dirtab { padding: 4px;
           border-collapse: collapse;
-          border: 1px solid #b0b0b0;
+          border: 1px solid #84b0c7;
 }
-TH.dirtab { background: #eeeeff;
+TH.dirtab { background: #e8eef2;
             font-weight: bold;
 }
 HR { height: 1px;
      border: none;
      border-top: 1px solid black;
 }
+
diff --git a/doc/gutenprintui2/html/files.html b/doc/gutenprintui2/html/files.html
index a0c932c..1b7d259 100644
--- a/doc/gutenprintui2/html/files.html
+++ b/doc/gutenprintui2/html/files.html
@@ -2,17 +2,29 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: File Index</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindexHL" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <h1>libgutenprintui2 API Reference File List</h1>Here is a list of all files with brief descriptions:<table>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></td><td class="indexvalue"></td></tr>
   <tr><td class="indexkey">include/gutenprintui2/<a class="el" href="typebuiltins_8h.html">typebuiltins.h</a></td><td class="indexvalue"></td></tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions.html b/doc/gutenprintui2/html/functions.html
index c355319..5a8dcc2 100644
--- a/doc/gutenprintui2/html/functions.html
+++ b/doc/gutenprintui2/html/functions.html
@@ -2,104 +2,144 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindexHL" href="functions.html">All</a> | <a class="qindex" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_q">q</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li id="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="functions.html"><span>All</span></a></li>
+    <li><a href="functions_vars.html"><span>Variables</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index__"><span>_</span></a></li>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_q"><span>q</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all struct and union fields with links to the structures/unions they belong to:
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_gtk_reserved1
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass</a><li>_gtk_reserved2
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass</a><li>_gtk_reserved3
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass</a><li>_gtk_reserved4
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass</a></ul>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#858c3bfbf2316dff67461668960ea424">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#858c3bfbf2316dff67461668960ea424">_StpuiCurveClass</a><li>_gtk_reserved2
+: <a class="el" href="struct__StpuiGammaCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiCurveClass</a><li>_gtk_reserved3
+: <a class="el" href="struct__StpuiGammaCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_StpuiCurveClass</a><li>_gtk_reserved4
+: <a class="el" href="struct__StpuiGammaCurveClass.html#43708b729750b48f02a0273f72cb8947">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#43708b729750b48f02a0273f72cb8947">_StpuiCurveClass</a></ul>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>auto_size_roll_feed_paper
-: <a class="el" href="structstpui__plist__t.html#o10">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#b679b17522d3fbb138dad90635cb91f7">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>button
-: <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#f40e80ae3d6e7d34a12bf5c9d58c140b">_StpuiGammaCurve</a></ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_type
-: <a class="el" href="structstpui__plist__t.html#o1">stpui_plist_t</a><li>crop
-: <a class="el" href="structstpui__image.html#o7">stpui_image</a><li>ctlpoint
-: <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve</a><li>current_standard_command
-: <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t</a><li>cursor_type
-: <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve</a><li>curve
-: <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve</a><li>curve_type
-: <a class="el" href="struct__StpuiCurve.html#o7">_StpuiCurve</a><li>curve_type_changed
-: <a class="el" href="struct__StpuiCurveClass.html#o1">_StpuiCurveClass</a><li>custom_command
-: <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#193b6cc04eadeb71b71417bf19c48c4c">stpui_plist_t</a><li>crop
+: <a class="el" href="structstpui__image.html#6746aa4c8378f9674566fbefb37a6aa7">stpui_image</a><li>ctlpoint
+: <a class="el" href="struct__StpuiCurve.html#b4de71fdc43c7448028e425034663828">_StpuiCurve</a><li>current_standard_command
+: <a class="el" href="structstpui__plist__t.html#d7d54f45247db317b37d0a4a1b4fc3d2">stpui_plist_t</a><li>cursor_type
+: <a class="el" href="struct__StpuiCurve.html#aeb92d99e85efb4bafc8170ff337d9a5">_StpuiCurve</a><li>curve
+: <a class="el" href="struct__StpuiGammaCurve.html#4efa264f5ef3e1a5c95736e07544ebf0">_StpuiGammaCurve</a><li>curve_type
+: <a class="el" href="struct__StpuiCurve.html#a15d0c7b1a08ed0fb3e8675f60ceeb63">_StpuiCurve</a><li>curve_type_changed
+: <a class="el" href="struct__StpuiCurveClass.html#bd4d748a3214fe60405dd0f19071963c">_StpuiCurveClass</a><li>custom_command
+: <a class="el" href="structstpui__plist__t.html#4ea7b75bdeda81e50ea3cd316b341f41">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>extra_printer_options
-: <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#41633c85d02d5b0157efadd6414fa77e">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gamma
-: <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve</a><li>gamma_dialog
-: <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve</a><li>gamma_text
-: <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve</a><li>grab_point
-: <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve</a><li>graph
-: <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#05b048d7242cb7b8b57cfa3b1d65ecea">_StpuiGammaCurve</a><li>gamma_dialog
+: <a class="el" href="struct__StpuiGammaCurve.html#8dadefcd22adf55ea28403e900b2329e">_StpuiGammaCurve</a><li>gamma_text
+: <a class="el" href="struct__StpuiGammaCurve.html#5b7be56d829006b2914afe741e75a31e">_StpuiGammaCurve</a><li>grab_point
+: <a class="el" href="struct__StpuiCurve.html#87568e046fdaaa74725653dc4de489fb">_StpuiCurve</a><li>graph
+: <a class="el" href="struct__StpuiCurve.html#f8b0b924ebd7046dbfa85a856e4682c8">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>height
-: <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve</a><li>hflip
-: <a class="el" href="structstpui__image.html#o2">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#b435e227d5dd201e1768b2bcb2e0aa81">_StpuiCurve</a><li>hflip
+: <a class="el" href="structstpui__image.html#59c4e5062d0201345d9a3c517faed76b">stpui_image</a></ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image.html#o0">stpui_image</a><li>invalid_mask
-: <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__image.html#73bebce395b6f1efedcf6842fbdb4d76">stpui_image</a><li>invalid_mask
+: <a class="el" href="structstpui__plist__t.html#01f4a6c8919018e9df44948ed78a5f71">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last
-: <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#98bd1c45684cf587ac2347a92dd7bb51">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>max_x
-: <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve</a><li>max_y
-: <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve</a><li>min_x
-: <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve</a><li>min_y
-: <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#2cc8505f392b3757b8e289d83c321693">_StpuiCurve</a><li>max_y
+: <a class="el" href="struct__StpuiCurve.html#2c34fcda6babf4933d253ae6cd7c9419">_StpuiCurve</a><li>min_x
+: <a class="el" href="struct__StpuiCurve.html#42911f1fe1166d1441b07b5df42cc5c8">_StpuiCurve</a><li>min_y
+: <a class="el" href="struct__StpuiCurve.html#6557fd2c11b2f6a56a5ab6bbb85cbc19">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t</a><li>num_ctlpoints
-: <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve</a><li>num_points
-: <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve</a></ul>
+: <a class="el" href="structstpui__plist__t.html#b068931cc450442b63f5b3d276ea4297">stpui_plist_t</a><li>num_ctlpoints
+: <a class="el" href="struct__StpuiCurve.html#7268e58fecac8344b32a31da68b341ec">_StpuiCurve</a><li>num_points
+: <a class="el" href="struct__StpuiCurve.html#041da0cf21a17db4fedb8045c0eacdb3">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orientation
-: <a class="el" href="structstpui__plist__t.html#o8">stpui_plist_t</a><li>output_filename
-: <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#da1639422ad8f355d2371428471379b5">stpui_plist_t</a><li>output_filename
+: <a class="el" href="structstpui__plist__t.html#9c39e63596d53eb17161a43fce627940">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>parent_class
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass</a><li>pixmap
-: <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve</a><li>point
-: <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">_StpuiCurveClass</a><li>pixmap
+: <a class="el" href="struct__StpuiCurve.html#8580443f4197aa43eeb23b41f3984de3">_StpuiCurve</a><li>point
+: <a class="el" href="struct__StpuiCurve.html#78ee54aa8f813885fe2fe20d232518b9">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_q">- q -</a></h3><ul>
 <li>queue_name
-: <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#692e12dd54ad3badf18627bdb1784843">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image.html#o6">stpui_image</a><li>rotate_ccw
-: <a class="el" href="structstpui__image.html#o4">stpui_image</a><li>rotate_cw
-: <a class="el" href="structstpui__image.html#o5">stpui_image</a></ul>
+: <a class="el" href="structstpui__image.html#38ffe38f14b789767f8a2f7823ad665f">stpui_image</a><li>rotate_ccw
+: <a class="el" href="structstpui__image.html#2dd5e7759fa1a528d7d609558f9a3af9">stpui_image</a><li>rotate_cw
+: <a class="el" href="structstpui__image.html#2f391913505ad8be5f120fdc15083631">stpui_image</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
-: <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#0ad29dfafe3dc8ad331b9397912e3d4d">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>table
-: <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve</a><li>transpose
-: <a class="el" href="structstpui__image.html#o1">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#aab9e1de16f38176f86d7a92ba337a8d">_StpuiGammaCurve</a><li>transpose
+: <a class="el" href="structstpui__image.html#2eab557840c9b342f902b27b6f4374c5">stpui_image</a></ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
-: <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#3e34bdebd9bd5edda27e8728904a2552">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
-: <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
-: <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="structstpui__plist__t.html#9e3669d19b675bd57058fd4664205d2a">stpui_plist_t</a><li>vbox
+: <a class="el" href="struct__StpuiGammaCurve.html#fad9b4ea6fda50ab90f21ab8d4b6b70c">_StpuiGammaCurve</a><li>vflip
+: <a class="el" href="structstpui__image.html#5a79d8a51117f0f542de337737559e35">stpui_image</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/functions_vars.html b/doc/gutenprintui2/html/functions_vars.html
index d836463..0682e40 100644
--- a/doc/gutenprintui2/html/functions_vars.html
+++ b/doc/gutenprintui2/html/functions_vars.html
@@ -2,104 +2,144 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields - Variables</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindexHL" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="functions.html">All</a> | <a class="qindexHL" href="functions_vars.html">Variables</a></div>
-<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_a">a</a> | <a class="qindex" href="#index_b">b</a> | <a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_e">e</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_h">h</a> | <a class="qindex" href="#index_i">i</a> | <a class="qindex" href="#index_l">l</a> | <a class="qindex" href="#index_m">m</a> | <a class="qindex" href="#index_n">n</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_p">p</a> | <a class="qindex" href="#index_q">q</a> | <a class="qindex" href="#index_r">r</a> | <a class="qindex" href="#index_s">s</a> | <a class="qindex" href="#index_t">t</a> | <a class="qindex" href="#index_u">u</a> | <a class="qindex" href="#index_v">v</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li id="current"><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="functions.html"><span>All</span></a></li>
+    <li id="current"><a href="functions_vars.html"><span>Variables</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index__"><span>_</span></a></li>
+    <li><a href="#index_a"><span>a</span></a></li>
+    <li><a href="#index_b"><span>b</span></a></li>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_e"><span>e</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_h"><span>h</span></a></li>
+    <li><a href="#index_i"><span>i</span></a></li>
+    <li><a href="#index_l"><span>l</span></a></li>
+    <li><a href="#index_m"><span>m</span></a></li>
+    <li><a href="#index_n"><span>n</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_p"><span>p</span></a></li>
+    <li><a href="#index_q"><span>q</span></a></li>
+    <li><a href="#index_r"><span>r</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+    <li><a href="#index_t"><span>t</span></a></li>
+    <li><a href="#index_u"><span>u</span></a></li>
+    <li><a href="#index_v"><span>v</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index__">- _ -</a></h3><ul>
 <li>_gtk_reserved1
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass</a><li>_gtk_reserved2
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass</a><li>_gtk_reserved3
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass</a><li>_gtk_reserved4
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass</a></ul>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#858c3bfbf2316dff67461668960ea424">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#858c3bfbf2316dff67461668960ea424">_StpuiCurveClass</a><li>_gtk_reserved2
+: <a class="el" href="struct__StpuiGammaCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiCurveClass</a><li>_gtk_reserved3
+: <a class="el" href="struct__StpuiGammaCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_StpuiCurveClass</a><li>_gtk_reserved4
+: <a class="el" href="struct__StpuiGammaCurveClass.html#43708b729750b48f02a0273f72cb8947">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#43708b729750b48f02a0273f72cb8947">_StpuiCurveClass</a></ul>
 <h3><a class="anchor" name="index_a">- a -</a></h3><ul>
 <li>auto_size_roll_feed_paper
-: <a class="el" href="structstpui__plist__t.html#o10">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#b679b17522d3fbb138dad90635cb91f7">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_b">- b -</a></h3><ul>
 <li>button
-: <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#f40e80ae3d6e7d34a12bf5c9d58c140b">_StpuiGammaCurve</a></ul>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_type
-: <a class="el" href="structstpui__plist__t.html#o1">stpui_plist_t</a><li>crop
-: <a class="el" href="structstpui__image.html#o7">stpui_image</a><li>ctlpoint
-: <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve</a><li>current_standard_command
-: <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t</a><li>cursor_type
-: <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve</a><li>curve
-: <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve</a><li>curve_type
-: <a class="el" href="struct__StpuiCurve.html#o7">_StpuiCurve</a><li>curve_type_changed
-: <a class="el" href="struct__StpuiCurveClass.html#o1">_StpuiCurveClass</a><li>custom_command
-: <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#193b6cc04eadeb71b71417bf19c48c4c">stpui_plist_t</a><li>crop
+: <a class="el" href="structstpui__image.html#6746aa4c8378f9674566fbefb37a6aa7">stpui_image</a><li>ctlpoint
+: <a class="el" href="struct__StpuiCurve.html#b4de71fdc43c7448028e425034663828">_StpuiCurve</a><li>current_standard_command
+: <a class="el" href="structstpui__plist__t.html#d7d54f45247db317b37d0a4a1b4fc3d2">stpui_plist_t</a><li>cursor_type
+: <a class="el" href="struct__StpuiCurve.html#aeb92d99e85efb4bafc8170ff337d9a5">_StpuiCurve</a><li>curve
+: <a class="el" href="struct__StpuiGammaCurve.html#4efa264f5ef3e1a5c95736e07544ebf0">_StpuiGammaCurve</a><li>curve_type
+: <a class="el" href="struct__StpuiCurve.html#a15d0c7b1a08ed0fb3e8675f60ceeb63">_StpuiCurve</a><li>curve_type_changed
+: <a class="el" href="struct__StpuiCurveClass.html#bd4d748a3214fe60405dd0f19071963c">_StpuiCurveClass</a><li>custom_command
+: <a class="el" href="structstpui__plist__t.html#4ea7b75bdeda81e50ea3cd316b341f41">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_e">- e -</a></h3><ul>
 <li>extra_printer_options
-: <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#41633c85d02d5b0157efadd6414fa77e">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>gamma
-: <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve</a><li>gamma_dialog
-: <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve</a><li>gamma_text
-: <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve</a><li>grab_point
-: <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve</a><li>graph
-: <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#05b048d7242cb7b8b57cfa3b1d65ecea">_StpuiGammaCurve</a><li>gamma_dialog
+: <a class="el" href="struct__StpuiGammaCurve.html#8dadefcd22adf55ea28403e900b2329e">_StpuiGammaCurve</a><li>gamma_text
+: <a class="el" href="struct__StpuiGammaCurve.html#5b7be56d829006b2914afe741e75a31e">_StpuiGammaCurve</a><li>grab_point
+: <a class="el" href="struct__StpuiCurve.html#87568e046fdaaa74725653dc4de489fb">_StpuiCurve</a><li>graph
+: <a class="el" href="struct__StpuiCurve.html#f8b0b924ebd7046dbfa85a856e4682c8">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_h">- h -</a></h3><ul>
 <li>height
-: <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve</a><li>hflip
-: <a class="el" href="structstpui__image.html#o2">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#b435e227d5dd201e1768b2bcb2e0aa81">_StpuiCurve</a><li>hflip
+: <a class="el" href="structstpui__image.html#59c4e5062d0201345d9a3c517faed76b">stpui_image</a></ul>
 <h3><a class="anchor" name="index_i">- i -</a></h3><ul>
 <li>im
-: <a class="el" href="structstpui__image.html#o0">stpui_image</a><li>invalid_mask
-: <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__image.html#73bebce395b6f1efedcf6842fbdb4d76">stpui_image</a><li>invalid_mask
+: <a class="el" href="structstpui__plist__t.html#01f4a6c8919018e9df44948ed78a5f71">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_l">- l -</a></h3><ul>
 <li>last
-: <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#98bd1c45684cf587ac2347a92dd7bb51">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_m">- m -</a></h3><ul>
 <li>max_x
-: <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve</a><li>max_y
-: <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve</a><li>min_x
-: <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve</a><li>min_y
-: <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiCurve.html#2cc8505f392b3757b8e289d83c321693">_StpuiCurve</a><li>max_y
+: <a class="el" href="struct__StpuiCurve.html#2c34fcda6babf4933d253ae6cd7c9419">_StpuiCurve</a><li>min_x
+: <a class="el" href="struct__StpuiCurve.html#42911f1fe1166d1441b07b5df42cc5c8">_StpuiCurve</a><li>min_y
+: <a class="el" href="struct__StpuiCurve.html#6557fd2c11b2f6a56a5ab6bbb85cbc19">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_n">- n -</a></h3><ul>
 <li>name
-: <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t</a><li>num_ctlpoints
-: <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve</a><li>num_points
-: <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve</a></ul>
+: <a class="el" href="structstpui__plist__t.html#b068931cc450442b63f5b3d276ea4297">stpui_plist_t</a><li>num_ctlpoints
+: <a class="el" href="struct__StpuiCurve.html#7268e58fecac8344b32a31da68b341ec">_StpuiCurve</a><li>num_points
+: <a class="el" href="struct__StpuiCurve.html#041da0cf21a17db4fedb8045c0eacdb3">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orientation
-: <a class="el" href="structstpui__plist__t.html#o8">stpui_plist_t</a><li>output_filename
-: <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#da1639422ad8f355d2371428471379b5">stpui_plist_t</a><li>output_filename
+: <a class="el" href="structstpui__plist__t.html#9c39e63596d53eb17161a43fce627940">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_p">- p -</a></h3><ul>
 <li>parent_class
-: <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass</a><li>pixmap
-: <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve</a><li>point
-: <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve</a></ul>
+: <a class="el" href="struct__StpuiGammaCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">_StpuiGammaCurveClass</a>, <a class="el" href="struct__StpuiCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">_StpuiCurveClass</a><li>pixmap
+: <a class="el" href="struct__StpuiCurve.html#8580443f4197aa43eeb23b41f3984de3">_StpuiCurve</a><li>point
+: <a class="el" href="struct__StpuiCurve.html#78ee54aa8f813885fe2fe20d232518b9">_StpuiCurve</a></ul>
 <h3><a class="anchor" name="index_q">- q -</a></h3><ul>
 <li>queue_name
-: <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#692e12dd54ad3badf18627bdb1784843">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_r">- r -</a></h3><ul>
 <li>rotate_180
-: <a class="el" href="structstpui__image.html#o6">stpui_image</a><li>rotate_ccw
-: <a class="el" href="structstpui__image.html#o4">stpui_image</a><li>rotate_cw
-: <a class="el" href="structstpui__image.html#o5">stpui_image</a></ul>
+: <a class="el" href="structstpui__image.html#38ffe38f14b789767f8a2f7823ad665f">stpui_image</a><li>rotate_ccw
+: <a class="el" href="structstpui__image.html#2dd5e7759fa1a528d7d609558f9a3af9">stpui_image</a><li>rotate_cw
+: <a class="el" href="structstpui__image.html#2f391913505ad8be5f120fdc15083631">stpui_image</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>scaling
-: <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#0ad29dfafe3dc8ad331b9397912e3d4d">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_t">- t -</a></h3><ul>
 <li>table
-: <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve</a><li>transpose
-: <a class="el" href="structstpui__image.html#o1">stpui_image</a></ul>
+: <a class="el" href="struct__StpuiGammaCurve.html#aab9e1de16f38176f86d7a92ba337a8d">_StpuiGammaCurve</a><li>transpose
+: <a class="el" href="structstpui__image.html#2eab557840c9b342f902b27b6f4374c5">stpui_image</a></ul>
 <h3><a class="anchor" name="index_u">- u -</a></h3><ul>
 <li>unit
-: <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t</a></ul>
+: <a class="el" href="structstpui__plist__t.html#3e34bdebd9bd5edda27e8728904a2552">stpui_plist_t</a></ul>
 <h3><a class="anchor" name="index_v">- v -</a></h3><ul>
 <li>v
-: <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t</a><li>vbox
-: <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve</a><li>vflip
-: <a class="el" href="structstpui__image.html#o3">stpui_image</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="structstpui__plist__t.html#9e3669d19b675bd57058fd4664205d2a">stpui_plist_t</a><li>vbox
+: <a class="el" href="struct__StpuiGammaCurve.html#fad9b4ea6fda50ab90f21ab8d4b6b70c">_StpuiGammaCurve</a><li>vflip
+: <a class="el" href="structstpui__image.html#5a79d8a51117f0f542de337737559e35">stpui_image</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gammacurve_8h.html b/doc/gutenprintui2/html/gammacurve_8h.html
index c294a6a..ceb94e0 100644
--- a/doc/gutenprintui2/html/gammacurve_8h.html
+++ b/doc/gutenprintui2/html/gammacurve_8h.html
@@ -2,11 +2,23 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/gammacurve.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a></div>
 <h1>gammacurve.h File Reference</h1><code>#include &lt;gdk/gdk.h&gt;</code><br>
 <code>#include &lt;gtk/gtkvbox.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
@@ -17,31 +29,31 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a0">STPUI_TYPE_GAMMA_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_gamma_curve_get_type ())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#2575918538735bd891f2e4d9ec05d7b1">STPUI_TYPE_GAMMA_CURVE</a>&nbsp;&nbsp;&nbsp;(stpui_gamma_curve_get_type ())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a1">STPUI_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#679501caed595f5d700271b9991b724f">STPUI_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_CAST ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurve.html">StpuiGammaCurve</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a2">STPUI_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#8272afcf9ea42c3823c2d201fa13ba39">STPUI_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_CAST ((klass), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a3">STPUI_IS_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#3838127029e05b8b71b4bb177ae8212e">STPUI_IS_GAMMA_CURVE</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_INSTANCE_TYPE ((obj), STPUI_TYPE_GAMMA_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a4">STPUI_IS_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#c574b30d0e65b8f5f6cd110405cbe9fb">STPUI_IS_GAMMA_CURVE_CLASS</a>(klass)&nbsp;&nbsp;&nbsp;(G_TYPE_CHECK_CLASS_TYPE ((klass), STPUI_TYPE_GAMMA_CURVE))</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a5">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#9d8fed0608357a55c11c5adba1f6d1b5">STPUI_GAMMA_CURVE_GET_CLASS</a>(obj)&nbsp;&nbsp;&nbsp;(G_TYPE_INSTANCE_GET_CLASS ((obj), STPUI_TYPE_GAMMA_CURVE, <a class="el" href="struct__StpuiGammaCurveClass.html">StpuiGammaCurveClass</a>))</td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a6">StpuiGammaCurve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurve.html">_StpuiGammaCurve</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#e112dc0cc75594e7e8efd332fe2c9c5b">StpuiGammaCurve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a7">StpuiGammaCurveClass</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="struct__StpuiGammaCurveClass.html">_StpuiGammaCurveClass</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#4ab4956b6af215068a2592a98ae43cbc">StpuiGammaCurveClass</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a8">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#57a0864588671f9b1ed5a64be3a06ed5">stpui_gamma_curve_get_type</a> (void) G_GNUC_CONST</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#a9">stpui_gamma_curve_new</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gammacurve_8h.html#b3038f4fe63c6035e3f1ec876559d8f9">stpui_gamma_curve_new</a> (void)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="a1" args="(obj)" --><p>
+<a class="anchor" name="679501caed595f5d700271b9991b724f"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE" ref="679501caed595f5d700271b9991b724f" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -69,7 +81,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="a2" args="(klass)" --><p>
+<a class="anchor" name="8272afcf9ea42c3823c2d201fa13ba39"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_CLASS" ref="8272afcf9ea42c3823c2d201fa13ba39" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -97,7 +109,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="a5" args="(obj)" --><p>
+<a class="anchor" name="9d8fed0608357a55c11c5adba1f6d1b5"></a><!-- doxytag: member="gammacurve.h::STPUI_GAMMA_CURVE_GET_CLASS" ref="9d8fed0608357a55c11c5adba1f6d1b5" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -125,7 +137,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="a3" args="(obj)" --><p>
+<a class="anchor" name="3838127029e05b8b71b4bb177ae8212e"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE" ref="3838127029e05b8b71b4bb177ae8212e" args="(obj)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -153,7 +165,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a4"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="a4" args="(klass)" --><p>
+<a class="anchor" name="c574b30d0e65b8f5f6cd110405cbe9fb"></a><!-- doxytag: member="gammacurve.h::STPUI_IS_GAMMA_CURVE_CLASS" ref="c574b30d0e65b8f5f6cd110405cbe9fb" args="(klass)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -181,7 +193,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="a0" args="" --><p>
+<a class="anchor" name="2575918538735bd891f2e4d9ec05d7b1"></a><!-- doxytag: member="gammacurve.h::STPUI_TYPE_GAMMA_CURVE" ref="2575918538735bd891f2e4d9ec05d7b1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -205,7 +217,7 @@
   </tr>
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a6"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="a6" args="" --><p>
+<a class="anchor" name="e112dc0cc75594e7e8efd332fe2c9c5b"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurve" ref="e112dc0cc75594e7e8efd332fe2c9c5b" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -228,7 +240,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a7"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="a7" args="" --><p>
+<a class="anchor" name="4ab4956b6af215068a2592a98ae43cbc"></a><!-- doxytag: member="gammacurve.h::StpuiGammaCurveClass" ref="4ab4956b6af215068a2592a98ae43cbc" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -252,7 +264,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a8"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="a8" args="(void) G_GNUC_CONST" --><p>
+<a class="anchor" name="57a0864588671f9b1ed5a64be3a06ed5"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_get_type" ref="57a0864588671f9b1ed5a64be3a06ed5" args="(void) G_GNUC_CONST" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -280,7 +292,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a9"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="a9" args="(void)" --><p>
+<a class="anchor" name="b3038f4fe63c6035e3f1ec876559d8f9"></a><!-- doxytag: member="gammacurve.h::stpui_gamma_curve_new" ref="b3038f4fe63c6035e3f1ec876559d8f9" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -308,8 +320,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals.html b/doc/gutenprintui2/html/globals.html
index 5f0f66a..f488173 100644
--- a/doc/gutenprintui2/html/globals.html
+++ b/doc/gutenprintui2/html/globals.html
@@ -2,125 +2,153 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_g">g</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_g"><span>g</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
 Here is a list of all functions, variables, defines, enums, and typedefs with links to the files they belong to:
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_t
-: <a class="el" href="gutenprintui_8h.html#a63">gutenprintui.h</a><li>command_t_command_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a4">typebuiltins.h</a><li>COMMAND_TYPE_CUSTOM
-: <a class="el" href="gutenprintui_8h.html#a63a8">gutenprintui.h</a><li>COMMAND_TYPE_DEFAULT
-: <a class="el" href="gutenprintui_8h.html#a63a7">gutenprintui.h</a><li>COMMAND_TYPE_FILE
-: <a class="el" href="gutenprintui_8h.html#a63a9">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">gutenprintui.h</a><li>command_t_command_t_get_type()
+: <a class="el" href="typebuiltins_8h.html#43d1612dab4df6c31f9b5362f88eaadf">typebuiltins.h</a><li>COMMAND_TYPE_CUSTOM
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda">gutenprintui.h</a><li>COMMAND_TYPE_DEFAULT
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb">gutenprintui.h</a><li>COMMAND_TYPE_FILE
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40">gutenprintui.h</a></ul>
 <h3><a class="anchor" name="index_g">- g -</a></h3><ul>
 <li>get_thumbnail_func_t
-: <a class="el" href="gutenprintui_8h.html#a1">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">gutenprintui.h</a></ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>ORIENT_AUTO
-: <a class="el" href="gutenprintui_8h.html#a62a2">gutenprintui.h</a><li>ORIENT_LANDSCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a4">gutenprintui.h</a><li>ORIENT_PORTRAIT
-: <a class="el" href="gutenprintui_8h.html#a62a3">gutenprintui.h</a><li>ORIENT_SEASCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a6">gutenprintui.h</a><li>orient_t
-: <a class="el" href="gutenprintui_8h.html#a62">gutenprintui.h</a><li>orient_t_orient_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a3">typebuiltins.h</a><li>ORIENT_UPSIDEDOWN
-: <a class="el" href="gutenprintui_8h.html#a62a5">gutenprintui.h</a></ul>
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0">gutenprintui.h</a><li>ORIENT_LANDSCAPE
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba">gutenprintui.h</a><li>ORIENT_PORTRAIT
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80">gutenprintui.h</a><li>ORIENT_SEASCAPE
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581">gutenprintui.h</a><li>orient_t
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593">gutenprintui.h</a><li>orient_t_orient_t_get_type()
+: <a class="el" href="typebuiltins_8h.html#2c321ec10322da403b1709b4a8956ee3">typebuiltins.h</a><li>ORIENT_UPSIDEDOWN
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88">gutenprintui.h</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stpui_build_standard_print_command()
-: <a class="el" href="gutenprintui_8h.html#a38">gutenprintui.h</a><li>stpui_compute_orientation()
-: <a class="el" href="gutenprintui_8h.html#a51">gutenprintui.h</a><li>STPUI_CURVE
-: <a class="el" href="curve_8h.html#a1">curve.h</a><li>STPUI_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a2">curve.h</a><li>STPUI_CURVE_GET_CLASS
-: <a class="el" href="curve_8h.html#a5">curve.h</a><li>stpui_curve_get_type()
-: <a class="el" href="curve_8h.html#a11">curve.h</a><li>stpui_curve_get_vector()
-: <a class="el" href="curve_8h.html#a16">curve.h</a><li>stpui_curve_new()
-: <a class="el" href="curve_8h.html#a12">curve.h</a><li>stpui_curve_reset()
-: <a class="el" href="curve_8h.html#a13">curve.h</a><li>stpui_curve_set_curve_type()
-: <a class="el" href="curve_8h.html#a18">curve.h</a><li>stpui_curve_set_gamma()
-: <a class="el" href="curve_8h.html#a14">curve.h</a><li>stpui_curve_set_range()
-: <a class="el" href="curve_8h.html#a15">curve.h</a><li>stpui_curve_set_vector()
-: <a class="el" href="curve_8h.html#a17">curve.h</a><li>STPUI_CURVE_TYPE_FREE
-: <a class="el" href="curve_8h.html#a19a10">curve.h</a><li>stpui_curve_type_get_type()
-: <a class="el" href="typebuiltins_8h.html#a5">typebuiltins.h</a><li>STPUI_CURVE_TYPE_LINEAR
-: <a class="el" href="curve_8h.html#a19a8">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
-: <a class="el" href="curve_8h.html#a19a9">curve.h</a><li>stpui_do_print_dialog()
-: <a class="el" href="gutenprintui_8h.html#a50">gutenprintui.h</a><li>STPUI_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a1">gammacurve.h</a><li>STPUI_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a2">gammacurve.h</a><li>STPUI_GAMMA_CURVE_GET_CLASS
-: <a class="el" href="gammacurve_8h.html#a5">gammacurve.h</a><li>stpui_gamma_curve_get_type()
-: <a class="el" href="gammacurve_8h.html#a8">gammacurve.h</a><li>stpui_gamma_curve_new()
-: <a class="el" href="gammacurve_8h.html#a9">gammacurve.h</a><li>stpui_get_current_printer()
-: <a class="el" href="gutenprintui_8h.html#a37">gutenprintui.h</a><li>stpui_get_errdata()
-: <a class="el" href="gutenprintui_8h.html#a49">gutenprintui.h</a><li>stpui_get_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a47">gutenprintui.h</a><li>stpui_get_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a33">gutenprintui.h</a><li>stpui_get_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a45">gutenprintui.h</a><li>stpui_get_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a40">gutenprintui.h</a><li>stpui_get_system_printers()
-: <a class="el" href="gutenprintui_8h.html#a42">gutenprintui.h</a><li>stpui_get_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a60">gutenprintui.h</a><li>stpui_get_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a58">gutenprintui.h</a><li>stpui_image_t
-: <a class="el" href="gutenprintui_8h.html#a0">gutenprintui.h</a><li>STPUI_IS_CURVE
-: <a class="el" href="curve_8h.html#a3">curve.h</a><li>STPUI_IS_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a4">curve.h</a><li>STPUI_IS_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a3">gammacurve.h</a><li>STPUI_IS_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a4">gammacurve.h</a><li>stpui_plist_add()
-: <a class="el" href="gutenprintui_8h.html#a35">gutenprintui.h</a><li>stpui_plist_copy()
-: <a class="el" href="gutenprintui_8h.html#a34">gutenprintui.h</a><li>stpui_plist_get_command_type()
-: <a class="el" href="gutenprintui_8h.html#a31">gutenprintui.h</a><li>stpui_plist_get_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a26">gutenprintui.h</a><li>stpui_plist_get_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a29">gutenprintui.h</a><li>stpui_plist_get_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a24">gutenprintui.h</a><li>stpui_plist_get_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a21">gutenprintui.h</a><li>stpui_plist_get_name()
-: <a class="el" href="gutenprintui_8h.html#a12">gutenprintui.h</a><li>stpui_plist_get_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a18">gutenprintui.h</a><li>stpui_plist_get_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a15">gutenprintui.h</a><li>stpui_plist_set_command_type()
-: <a class="el" href="gutenprintui_8h.html#a30">gutenprintui.h</a><li>stpui_plist_set_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a25">gutenprintui.h</a><li>stpui_plist_set_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a27">gutenprintui.h</a><li>stpui_plist_set_current_standard_command_n()
-: <a class="el" href="gutenprintui_8h.html#a28">gutenprintui.h</a><li>stpui_plist_set_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a22">gutenprintui.h</a><li>stpui_plist_set_custom_command_n()
-: <a class="el" href="gutenprintui_8h.html#a23">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a19">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options_n()
-: <a class="el" href="gutenprintui_8h.html#a20">gutenprintui.h</a><li>stpui_plist_set_name()
-: <a class="el" href="gutenprintui_8h.html#a10">gutenprintui.h</a><li>stpui_plist_set_name_n()
-: <a class="el" href="gutenprintui_8h.html#a11">gutenprintui.h</a><li>stpui_plist_set_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a16">gutenprintui.h</a><li>stpui_plist_set_output_filename_n()
-: <a class="el" href="gutenprintui_8h.html#a17">gutenprintui.h</a><li>stpui_plist_set_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a13">gutenprintui.h</a><li>stpui_plist_set_queue_name_n()
-: <a class="el" href="gutenprintui_8h.html#a14">gutenprintui.h</a><li>stpui_print()
-: <a class="el" href="gutenprintui_8h.html#a61">gutenprintui.h</a><li>stpui_printer_initialize()
-: <a class="el" href="gutenprintui_8h.html#a36">gutenprintui.h</a><li>stpui_printrc_load()
-: <a class="el" href="gutenprintui_8h.html#a41">gutenprintui.h</a><li>stpui_printrc_save()
-: <a class="el" href="gutenprintui_8h.html#a43">gutenprintui.h</a><li>stpui_set_errdata()
-: <a class="el" href="gutenprintui_8h.html#a48">gutenprintui.h</a><li>stpui_set_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a46">gutenprintui.h</a><li>stpui_set_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a32">gutenprintui.h</a><li>stpui_set_image_channel_depth()
-: <a class="el" href="gutenprintui_8h.html#a56">gutenprintui.h</a><li>stpui_set_image_dimensions()
-: <a class="el" href="gutenprintui_8h.html#a52">gutenprintui.h</a><li>stpui_set_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a44">gutenprintui.h</a><li>stpui_set_image_raw_channels()
-: <a class="el" href="gutenprintui_8h.html#a55">gutenprintui.h</a><li>stpui_set_image_resolution()
-: <a class="el" href="gutenprintui_8h.html#a53">gutenprintui.h</a><li>stpui_set_image_type()
-: <a class="el" href="gutenprintui_8h.html#a54">gutenprintui.h</a><li>stpui_set_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a39">gutenprintui.h</a><li>stpui_set_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a59">gutenprintui.h</a><li>stpui_set_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a57">gutenprintui.h</a><li>STPUI_TYPE_COMMAND_T
-: <a class="el" href="typebuiltins_8h.html#a1">typebuiltins.h</a><li>STPUI_TYPE_CURVE
-: <a class="el" href="curve_8h.html#a0">curve.h</a><li>STPUI_TYPE_CURVE_TYPE
-: <a class="el" href="typebuiltins_8h.html#a2">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a0">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
-: <a class="el" href="typebuiltins_8h.html#a0">typebuiltins.h</a><li>StpuiCurve
-: <a class="el" href="curve_8h.html#a6">curve.h</a><li>StpuiCurveClass
-: <a class="el" href="curve_8h.html#a7">curve.h</a><li>StpuiCurveType
-: <a class="el" href="curve_8h.html#a19">curve.h</a><li>StpuiGammaCurve
-: <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
-: <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#e63acdc3a4074290111bb1cece4437a1">gutenprintui.h</a><li>stpui_compute_orientation()
+: <a class="el" href="gutenprintui_8h.html#25b010dc52c84c5dc5a83b84c4973415">gutenprintui.h</a><li>STPUI_CURVE
+: <a class="el" href="curve_8h.html#767d8cf354306a35dc6b53e2aa033aa6">curve.h</a><li>STPUI_CURVE_CLASS
+: <a class="el" href="curve_8h.html#9a1005d0077d10338a6a7f16940e8233">curve.h</a><li>STPUI_CURVE_GET_CLASS
+: <a class="el" href="curve_8h.html#5995f171eca6b87af06afde3160fcac0">curve.h</a><li>stpui_curve_get_type()
+: <a class="el" href="curve_8h.html#3eafd87334a70bb87fca2084b558c2b2">curve.h</a><li>stpui_curve_get_vector()
+: <a class="el" href="curve_8h.html#6dfbda8721d6d652ef8f710a696d6367">curve.h</a><li>stpui_curve_new()
+: <a class="el" href="curve_8h.html#23667321d3acf52249e8c18506be017d">curve.h</a><li>stpui_curve_reset()
+: <a class="el" href="curve_8h.html#eb1c0e9894aaa04ade62d050aa5ea15b">curve.h</a><li>stpui_curve_set_curve_type()
+: <a class="el" href="curve_8h.html#9d6d8e461caf28083c2e1b76639c7d24">curve.h</a><li>stpui_curve_set_gamma()
+: <a class="el" href="curve_8h.html#2b8cf1c1a6badf89c3a7b95c87b91a72">curve.h</a><li>stpui_curve_set_range()
+: <a class="el" href="curve_8h.html#3701325c36b957b91b5e2719ffbaa28a">curve.h</a><li>stpui_curve_set_vector()
+: <a class="el" href="curve_8h.html#f611be61b641f4efc9b6044aacf98103">curve.h</a><li>STPUI_CURVE_TYPE_FREE
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da">curve.h</a><li>stpui_curve_type_get_type()
+: <a class="el" href="typebuiltins_8h.html#5e570d0225cd4f8ef426d648293dced9">typebuiltins.h</a><li>STPUI_CURVE_TYPE_LINEAR
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06">curve.h</a><li>stpui_do_print_dialog()
+: <a class="el" href="gutenprintui_8h.html#b6ff540cc47781f92bd98d11c609ad96">gutenprintui.h</a><li>STPUI_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#679501caed595f5d700271b9991b724f">gammacurve.h</a><li>STPUI_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#8272afcf9ea42c3823c2d201fa13ba39">gammacurve.h</a><li>STPUI_GAMMA_CURVE_GET_CLASS
+: <a class="el" href="gammacurve_8h.html#9d8fed0608357a55c11c5adba1f6d1b5">gammacurve.h</a><li>stpui_gamma_curve_get_type()
+: <a class="el" href="gammacurve_8h.html#57a0864588671f9b1ed5a64be3a06ed5">gammacurve.h</a><li>stpui_gamma_curve_new()
+: <a class="el" href="gammacurve_8h.html#b3038f4fe63c6035e3f1ec876559d8f9">gammacurve.h</a><li>stpui_get_current_printer()
+: <a class="el" href="gutenprintui_8h.html#8aa89d084c3364396974b7665f5a26f9">gutenprintui.h</a><li>stpui_get_errdata()
+: <a class="el" href="gutenprintui_8h.html#1280f5bad08d4f7ccbfbd64785102ce2">gutenprintui.h</a><li>stpui_get_errfunc()
+: <a class="el" href="gutenprintui_8h.html#92ac2b023b0352cb3d519ece77ccc51c">gutenprintui.h</a><li>stpui_get_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#51decc80a312291c9f99cde8a18393a6">gutenprintui.h</a><li>stpui_get_image_filename()
+: <a class="el" href="gutenprintui_8h.html#b46b5187c4d36188019c556f8685efdc">gutenprintui.h</a><li>stpui_get_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#47f72a1bf50eac641ab4f72af5ed379f">gutenprintui.h</a><li>stpui_get_system_printers()
+: <a class="el" href="gutenprintui_8h.html#35da543417b8be45c11c02c590bf4ef5">gutenprintui.h</a><li>stpui_get_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#eeca67486b0fae3eae3ed8d4c8b6ebe1">gutenprintui.h</a><li>stpui_get_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#e2ae7063801902cb0a4168974d81ab9b">gutenprintui.h</a><li>stpui_image_t
+: <a class="el" href="gutenprintui_8h.html#f0f2e236d924323378ded67b3e434dd5">gutenprintui.h</a><li>STPUI_IS_CURVE
+: <a class="el" href="curve_8h.html#e886ed1f007a40362f784d16c020ff40">curve.h</a><li>STPUI_IS_CURVE_CLASS
+: <a class="el" href="curve_8h.html#fc44896a3decd9b178cec7f90598c8b8">curve.h</a><li>STPUI_IS_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#3838127029e05b8b71b4bb177ae8212e">gammacurve.h</a><li>STPUI_IS_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#c574b30d0e65b8f5f6cd110405cbe9fb">gammacurve.h</a><li>stpui_plist_add()
+: <a class="el" href="gutenprintui_8h.html#9b28f7223268ab81ff605e733ebf97e5">gutenprintui.h</a><li>stpui_plist_copy()
+: <a class="el" href="gutenprintui_8h.html#a41fef36c0775105b3187708dbd9700a">gutenprintui.h</a><li>stpui_plist_get_command_type()
+: <a class="el" href="gutenprintui_8h.html#2f5b046cd01c6ad5bbccd485165928d7">gutenprintui.h</a><li>stpui_plist_get_copy_count()
+: <a class="el" href="gutenprintui_8h.html#4effa689c6a5e828c672b3feb0c91623">gutenprintui.h</a><li>stpui_plist_get_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#276c7fbf168c1431d8dce2f1393dac09">gutenprintui.h</a><li>stpui_plist_get_custom_command()
+: <a class="el" href="gutenprintui_8h.html#b31d172f0c6755ac149b498800c46141">gutenprintui.h</a><li>stpui_plist_get_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#6b83f5dbcdf2deeef19726e468d7cfe3">gutenprintui.h</a><li>stpui_plist_get_name()
+: <a class="el" href="gutenprintui_8h.html#c70ee1c3425b1a3be74a5dfc3476f079">gutenprintui.h</a><li>stpui_plist_get_output_filename()
+: <a class="el" href="gutenprintui_8h.html#f593816f98fad12bf48d461fe72ff31e">gutenprintui.h</a><li>stpui_plist_get_queue_name()
+: <a class="el" href="gutenprintui_8h.html#aecb54cd0535976fd51b2be080366c22">gutenprintui.h</a><li>stpui_plist_set_command_type()
+: <a class="el" href="gutenprintui_8h.html#b3cfd6a8b492bda54150c716f1631b4f">gutenprintui.h</a><li>stpui_plist_set_copy_count()
+: <a class="el" href="gutenprintui_8h.html#3252b3c283aca1a71da38ae9a7b9b9b5">gutenprintui.h</a><li>stpui_plist_set_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#c1e81fe45a8a3b4a6cd2682cdc21ddd1">gutenprintui.h</a><li>stpui_plist_set_current_standard_command_n()
+: <a class="el" href="gutenprintui_8h.html#8f7fe530f483f07c08dbe81efebbdb7a">gutenprintui.h</a><li>stpui_plist_set_custom_command()
+: <a class="el" href="gutenprintui_8h.html#5f04be99f3a2d8d788bd929d01823a75">gutenprintui.h</a><li>stpui_plist_set_custom_command_n()
+: <a class="el" href="gutenprintui_8h.html#13c2730e5161bf18e3a31fe4d2bb0b31">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#6fba852c389ed20d9d1da1610d3125db">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options_n()
+: <a class="el" href="gutenprintui_8h.html#b63f9f05403aa8edd3fc9a063d558a88">gutenprintui.h</a><li>stpui_plist_set_name()
+: <a class="el" href="gutenprintui_8h.html#8ad3d342e15a406c942d52a7d5e093b8">gutenprintui.h</a><li>stpui_plist_set_name_n()
+: <a class="el" href="gutenprintui_8h.html#ad9fc64007c7867e05743b6a30664fc4">gutenprintui.h</a><li>stpui_plist_set_output_filename()
+: <a class="el" href="gutenprintui_8h.html#e0e2a359527aded6f2dc60fe6ec5ff55">gutenprintui.h</a><li>stpui_plist_set_output_filename_n()
+: <a class="el" href="gutenprintui_8h.html#8a751b01cba31f15aed8f39ef72f8e37">gutenprintui.h</a><li>stpui_plist_set_queue_name()
+: <a class="el" href="gutenprintui_8h.html#8267cf35fd86b40ce1bddb958bc0828d">gutenprintui.h</a><li>stpui_plist_set_queue_name_n()
+: <a class="el" href="gutenprintui_8h.html#7b54207ec204cbe3327284ac9d56b188">gutenprintui.h</a><li>stpui_print()
+: <a class="el" href="gutenprintui_8h.html#7867f0a4ea47e5f9f80c3463e6029a8a">gutenprintui.h</a><li>stpui_printer_initialize()
+: <a class="el" href="gutenprintui_8h.html#63325efb553d690c83608ad9d75b9c5c">gutenprintui.h</a><li>stpui_printrc_load()
+: <a class="el" href="gutenprintui_8h.html#9768d9e8d5370bdd66710de1df8fe4d3">gutenprintui.h</a><li>stpui_printrc_save()
+: <a class="el" href="gutenprintui_8h.html#ea786257cd4a43a3ab947eb09d19907c">gutenprintui.h</a><li>stpui_set_errdata()
+: <a class="el" href="gutenprintui_8h.html#6bc23edc145044cffc5f9457f759523e">gutenprintui.h</a><li>stpui_set_errfunc()
+: <a class="el" href="gutenprintui_8h.html#cedc4d703e8a6e88243241245748a144">gutenprintui.h</a><li>stpui_set_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#35603794767eb756a784a74220e2e0cb">gutenprintui.h</a><li>stpui_set_image_channel_depth()
+: <a class="el" href="gutenprintui_8h.html#121e36a0905706f7af20b18d76723086">gutenprintui.h</a><li>stpui_set_image_dimensions()
+: <a class="el" href="gutenprintui_8h.html#c064fde3bd665a169a5bcee426fe90ad">gutenprintui.h</a><li>stpui_set_image_filename()
+: <a class="el" href="gutenprintui_8h.html#849dc9d8235aeae8c294ea97d3a2291d">gutenprintui.h</a><li>stpui_set_image_raw_channels()
+: <a class="el" href="gutenprintui_8h.html#9475be2668e339e552bf905b3b377697">gutenprintui.h</a><li>stpui_set_image_resolution()
+: <a class="el" href="gutenprintui_8h.html#58f2ba3797c5bed1328f2bac2aa71531">gutenprintui.h</a><li>stpui_set_image_type()
+: <a class="el" href="gutenprintui_8h.html#310705e065d4ae1b3ed2e1c9c5189b1b">gutenprintui.h</a><li>stpui_set_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#98928c6f53a0322dad08f1057882b2fd">gutenprintui.h</a><li>stpui_set_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#da2af8cf724e3bcbd49be2f5d1cd4bc2">gutenprintui.h</a><li>stpui_set_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#881c586fa5ec944b157b7cb92c05be7a">gutenprintui.h</a><li>STPUI_TYPE_COMMAND_T
+: <a class="el" href="typebuiltins_8h.html#c556621db9092f28e345b98cb6db57e3">typebuiltins.h</a><li>STPUI_TYPE_CURVE
+: <a class="el" href="curve_8h.html#5795444c0586277d34c693fc7b5deae0">curve.h</a><li>STPUI_TYPE_CURVE_TYPE
+: <a class="el" href="typebuiltins_8h.html#fd1aa89f9f88935e1482fa6675a28ee1">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#2575918538735bd891f2e4d9ec05d7b1">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
+: <a class="el" href="typebuiltins_8h.html#b188f6f607a7c274ff9b93a7b9183c92">typebuiltins.h</a><li>StpuiCurve
+: <a class="el" href="curve_8h.html#04ae3b4e227fca5f2aa871b0f9e1cab0">curve.h</a><li>StpuiCurveClass
+: <a class="el" href="curve_8h.html#13e6043625efd88837615685f7472e2d">curve.h</a><li>StpuiCurveType
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">curve.h</a><li>StpuiGammaCurve
+: <a class="el" href="gammacurve_8h.html#e112dc0cc75594e7e8efd332fe2c9c5b">gammacurve.h</a><li>StpuiGammaCurveClass
+: <a class="el" href="gammacurve_8h.html#4ab4956b6af215068a2592a98ae43cbc">gammacurve.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_defs.html b/doc/gutenprintui2/html/globals_defs.html
index 1b894f1..8c0a90a 100644
--- a/doc/gutenprintui2/html/globals_defs.html
+++ b/doc/gutenprintui2/html/globals_defs.html
@@ -2,31 +2,52 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindexHL" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li id="current"><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>STPUI_CURVE
-: <a class="el" href="curve_8h.html#a1">curve.h</a><li>STPUI_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a2">curve.h</a><li>STPUI_CURVE_GET_CLASS
-: <a class="el" href="curve_8h.html#a5">curve.h</a><li>STPUI_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a1">gammacurve.h</a><li>STPUI_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a2">gammacurve.h</a><li>STPUI_GAMMA_CURVE_GET_CLASS
-: <a class="el" href="gammacurve_8h.html#a5">gammacurve.h</a><li>STPUI_IS_CURVE
-: <a class="el" href="curve_8h.html#a3">curve.h</a><li>STPUI_IS_CURVE_CLASS
-: <a class="el" href="curve_8h.html#a4">curve.h</a><li>STPUI_IS_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a3">gammacurve.h</a><li>STPUI_IS_GAMMA_CURVE_CLASS
-: <a class="el" href="gammacurve_8h.html#a4">gammacurve.h</a><li>STPUI_TYPE_COMMAND_T
-: <a class="el" href="typebuiltins_8h.html#a1">typebuiltins.h</a><li>STPUI_TYPE_CURVE
-: <a class="el" href="curve_8h.html#a0">curve.h</a><li>STPUI_TYPE_CURVE_TYPE
-: <a class="el" href="typebuiltins_8h.html#a2">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
-: <a class="el" href="gammacurve_8h.html#a0">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
-: <a class="el" href="typebuiltins_8h.html#a0">typebuiltins.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="curve_8h.html#767d8cf354306a35dc6b53e2aa033aa6">curve.h</a><li>STPUI_CURVE_CLASS
+: <a class="el" href="curve_8h.html#9a1005d0077d10338a6a7f16940e8233">curve.h</a><li>STPUI_CURVE_GET_CLASS
+: <a class="el" href="curve_8h.html#5995f171eca6b87af06afde3160fcac0">curve.h</a><li>STPUI_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#679501caed595f5d700271b9991b724f">gammacurve.h</a><li>STPUI_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#8272afcf9ea42c3823c2d201fa13ba39">gammacurve.h</a><li>STPUI_GAMMA_CURVE_GET_CLASS
+: <a class="el" href="gammacurve_8h.html#9d8fed0608357a55c11c5adba1f6d1b5">gammacurve.h</a><li>STPUI_IS_CURVE
+: <a class="el" href="curve_8h.html#e886ed1f007a40362f784d16c020ff40">curve.h</a><li>STPUI_IS_CURVE_CLASS
+: <a class="el" href="curve_8h.html#fc44896a3decd9b178cec7f90598c8b8">curve.h</a><li>STPUI_IS_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#3838127029e05b8b71b4bb177ae8212e">gammacurve.h</a><li>STPUI_IS_GAMMA_CURVE_CLASS
+: <a class="el" href="gammacurve_8h.html#c574b30d0e65b8f5f6cd110405cbe9fb">gammacurve.h</a><li>STPUI_TYPE_COMMAND_T
+: <a class="el" href="typebuiltins_8h.html#c556621db9092f28e345b98cb6db57e3">typebuiltins.h</a><li>STPUI_TYPE_CURVE
+: <a class="el" href="curve_8h.html#5795444c0586277d34c693fc7b5deae0">curve.h</a><li>STPUI_TYPE_CURVE_TYPE
+: <a class="el" href="typebuiltins_8h.html#fd1aa89f9f88935e1482fa6675a28ee1">typebuiltins.h</a><li>STPUI_TYPE_GAMMA_CURVE
+: <a class="el" href="gammacurve_8h.html#2575918538735bd891f2e4d9ec05d7b1">gammacurve.h</a><li>STPUI_TYPE_ORIENT_T
+: <a class="el" href="typebuiltins_8h.html#b188f6f607a7c274ff9b93a7b9183c92">typebuiltins.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_enum.html b/doc/gutenprintui2/html/globals_enum.html
index 21cd628..0b2948e 100644
--- a/doc/gutenprintui2/html/globals_enum.html
+++ b/doc/gutenprintui2/html/globals_enum.html
@@ -2,19 +2,40 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindexHL" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li id="current"><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>command_t
-: <a class="el" href="gutenprintui_8h.html#a63">gutenprintui.h</a><li>orient_t
-: <a class="el" href="gutenprintui_8h.html#a62">gutenprintui.h</a><li>StpuiCurveType
-: <a class="el" href="curve_8h.html#a19">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">gutenprintui.h</a><li>orient_t
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593">gutenprintui.h</a><li>StpuiCurveType
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">curve.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_eval.html b/doc/gutenprintui2/html/globals_eval.html
index af67b4e..789cb12 100644
--- a/doc/gutenprintui2/html/globals_eval.html
+++ b/doc/gutenprintui2/html/globals_eval.html
@@ -2,27 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindexHL" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li id="current"><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>COMMAND_TYPE_CUSTOM
-: <a class="el" href="gutenprintui_8h.html#a63a8">gutenprintui.h</a><li>COMMAND_TYPE_DEFAULT
-: <a class="el" href="gutenprintui_8h.html#a63a7">gutenprintui.h</a><li>COMMAND_TYPE_FILE
-: <a class="el" href="gutenprintui_8h.html#a63a9">gutenprintui.h</a><li>ORIENT_AUTO
-: <a class="el" href="gutenprintui_8h.html#a62a2">gutenprintui.h</a><li>ORIENT_LANDSCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a4">gutenprintui.h</a><li>ORIENT_PORTRAIT
-: <a class="el" href="gutenprintui_8h.html#a62a3">gutenprintui.h</a><li>ORIENT_SEASCAPE
-: <a class="el" href="gutenprintui_8h.html#a62a6">gutenprintui.h</a><li>ORIENT_UPSIDEDOWN
-: <a class="el" href="gutenprintui_8h.html#a62a5">gutenprintui.h</a><li>STPUI_CURVE_TYPE_FREE
-: <a class="el" href="curve_8h.html#a19a10">curve.h</a><li>STPUI_CURVE_TYPE_LINEAR
-: <a class="el" href="curve_8h.html#a19a8">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
-: <a class="el" href="curve_8h.html#a19a9">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda">gutenprintui.h</a><li>COMMAND_TYPE_DEFAULT
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb">gutenprintui.h</a><li>COMMAND_TYPE_FILE
+: <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40">gutenprintui.h</a><li>ORIENT_AUTO
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0">gutenprintui.h</a><li>ORIENT_LANDSCAPE
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba">gutenprintui.h</a><li>ORIENT_PORTRAIT
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80">gutenprintui.h</a><li>ORIENT_SEASCAPE
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581">gutenprintui.h</a><li>ORIENT_UPSIDEDOWN
+: <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88">gutenprintui.h</a><li>STPUI_CURVE_TYPE_FREE
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e7449e4eef5779fc4da5e2ca2341c84da">curve.h</a><li>STPUI_CURVE_TYPE_LINEAR
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968ee32d2131f9b7e70d109be088fcd23297">curve.h</a><li>STPUI_CURVE_TYPE_SPLINE
+: <a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e50f0699c4a326f98d9ece6faca5dbb06">curve.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_func.html b/doc/gutenprintui2/html/globals_func.html
index 0e6d984..79bbc94 100644
--- a/doc/gutenprintui2/html/globals_func.html
+++ b/doc/gutenprintui2/html/globals_func.html
@@ -2,88 +2,115 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-<div class="qindex"><a class="qindex" href="#index_c">c</a> | <a class="qindex" href="#index_o">o</a> | <a class="qindex" href="#index_s">s</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li id="current"><a href="globals_func.html"><span>Functions</span></a></li>
+    <li><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+<div class="tabs">
+  <ul>
+    <li><a href="#index_c"><span>c</span></a></li>
+    <li><a href="#index_o"><span>o</span></a></li>
+    <li><a href="#index_s"><span>s</span></a></li>
+  </ul>
+</div>
 
 <p>
-
+&nbsp;
 <p>
 <h3><a class="anchor" name="index_c">- c -</a></h3><ul>
 <li>command_t_command_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a4">typebuiltins.h</a></ul>
+: <a class="el" href="typebuiltins_8h.html#43d1612dab4df6c31f9b5362f88eaadf">typebuiltins.h</a></ul>
 <h3><a class="anchor" name="index_o">- o -</a></h3><ul>
 <li>orient_t_orient_t_get_type()
-: <a class="el" href="typebuiltins_8h.html#a3">typebuiltins.h</a></ul>
+: <a class="el" href="typebuiltins_8h.html#2c321ec10322da403b1709b4a8956ee3">typebuiltins.h</a></ul>
 <h3><a class="anchor" name="index_s">- s -</a></h3><ul>
 <li>stpui_build_standard_print_command()
-: <a class="el" href="gutenprintui_8h.html#a38">gutenprintui.h</a><li>stpui_compute_orientation()
-: <a class="el" href="gutenprintui_8h.html#a51">gutenprintui.h</a><li>stpui_curve_get_type()
-: <a class="el" href="curve_8h.html#a11">curve.h</a><li>stpui_curve_get_vector()
-: <a class="el" href="curve_8h.html#a16">curve.h</a><li>stpui_curve_new()
-: <a class="el" href="curve_8h.html#a12">curve.h</a><li>stpui_curve_reset()
-: <a class="el" href="curve_8h.html#a13">curve.h</a><li>stpui_curve_set_curve_type()
-: <a class="el" href="curve_8h.html#a18">curve.h</a><li>stpui_curve_set_gamma()
-: <a class="el" href="curve_8h.html#a14">curve.h</a><li>stpui_curve_set_range()
-: <a class="el" href="curve_8h.html#a15">curve.h</a><li>stpui_curve_set_vector()
-: <a class="el" href="curve_8h.html#a17">curve.h</a><li>stpui_curve_type_get_type()
-: <a class="el" href="typebuiltins_8h.html#a5">typebuiltins.h</a><li>stpui_do_print_dialog()
-: <a class="el" href="gutenprintui_8h.html#a50">gutenprintui.h</a><li>stpui_gamma_curve_get_type()
-: <a class="el" href="gammacurve_8h.html#a8">gammacurve.h</a><li>stpui_gamma_curve_new()
-: <a class="el" href="gammacurve_8h.html#a9">gammacurve.h</a><li>stpui_get_current_printer()
-: <a class="el" href="gutenprintui_8h.html#a37">gutenprintui.h</a><li>stpui_get_errdata()
-: <a class="el" href="gutenprintui_8h.html#a49">gutenprintui.h</a><li>stpui_get_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a47">gutenprintui.h</a><li>stpui_get_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a33">gutenprintui.h</a><li>stpui_get_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a45">gutenprintui.h</a><li>stpui_get_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a40">gutenprintui.h</a><li>stpui_get_system_printers()
-: <a class="el" href="gutenprintui_8h.html#a42">gutenprintui.h</a><li>stpui_get_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a60">gutenprintui.h</a><li>stpui_get_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a58">gutenprintui.h</a><li>stpui_plist_add()
-: <a class="el" href="gutenprintui_8h.html#a35">gutenprintui.h</a><li>stpui_plist_copy()
-: <a class="el" href="gutenprintui_8h.html#a34">gutenprintui.h</a><li>stpui_plist_get_command_type()
-: <a class="el" href="gutenprintui_8h.html#a31">gutenprintui.h</a><li>stpui_plist_get_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a26">gutenprintui.h</a><li>stpui_plist_get_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a29">gutenprintui.h</a><li>stpui_plist_get_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a24">gutenprintui.h</a><li>stpui_plist_get_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a21">gutenprintui.h</a><li>stpui_plist_get_name()
-: <a class="el" href="gutenprintui_8h.html#a12">gutenprintui.h</a><li>stpui_plist_get_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a18">gutenprintui.h</a><li>stpui_plist_get_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a15">gutenprintui.h</a><li>stpui_plist_set_command_type()
-: <a class="el" href="gutenprintui_8h.html#a30">gutenprintui.h</a><li>stpui_plist_set_copy_count()
-: <a class="el" href="gutenprintui_8h.html#a25">gutenprintui.h</a><li>stpui_plist_set_current_standard_command()
-: <a class="el" href="gutenprintui_8h.html#a27">gutenprintui.h</a><li>stpui_plist_set_current_standard_command_n()
-: <a class="el" href="gutenprintui_8h.html#a28">gutenprintui.h</a><li>stpui_plist_set_custom_command()
-: <a class="el" href="gutenprintui_8h.html#a22">gutenprintui.h</a><li>stpui_plist_set_custom_command_n()
-: <a class="el" href="gutenprintui_8h.html#a23">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options()
-: <a class="el" href="gutenprintui_8h.html#a19">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options_n()
-: <a class="el" href="gutenprintui_8h.html#a20">gutenprintui.h</a><li>stpui_plist_set_name()
-: <a class="el" href="gutenprintui_8h.html#a10">gutenprintui.h</a><li>stpui_plist_set_name_n()
-: <a class="el" href="gutenprintui_8h.html#a11">gutenprintui.h</a><li>stpui_plist_set_output_filename()
-: <a class="el" href="gutenprintui_8h.html#a16">gutenprintui.h</a><li>stpui_plist_set_output_filename_n()
-: <a class="el" href="gutenprintui_8h.html#a17">gutenprintui.h</a><li>stpui_plist_set_queue_name()
-: <a class="el" href="gutenprintui_8h.html#a13">gutenprintui.h</a><li>stpui_plist_set_queue_name_n()
-: <a class="el" href="gutenprintui_8h.html#a14">gutenprintui.h</a><li>stpui_print()
-: <a class="el" href="gutenprintui_8h.html#a61">gutenprintui.h</a><li>stpui_printer_initialize()
-: <a class="el" href="gutenprintui_8h.html#a36">gutenprintui.h</a><li>stpui_printrc_load()
-: <a class="el" href="gutenprintui_8h.html#a41">gutenprintui.h</a><li>stpui_printrc_save()
-: <a class="el" href="gutenprintui_8h.html#a43">gutenprintui.h</a><li>stpui_set_errdata()
-: <a class="el" href="gutenprintui_8h.html#a48">gutenprintui.h</a><li>stpui_set_errfunc()
-: <a class="el" href="gutenprintui_8h.html#a46">gutenprintui.h</a><li>stpui_set_global_parameter()
-: <a class="el" href="gutenprintui_8h.html#a32">gutenprintui.h</a><li>stpui_set_image_channel_depth()
-: <a class="el" href="gutenprintui_8h.html#a56">gutenprintui.h</a><li>stpui_set_image_dimensions()
-: <a class="el" href="gutenprintui_8h.html#a52">gutenprintui.h</a><li>stpui_set_image_filename()
-: <a class="el" href="gutenprintui_8h.html#a44">gutenprintui.h</a><li>stpui_set_image_raw_channels()
-: <a class="el" href="gutenprintui_8h.html#a55">gutenprintui.h</a><li>stpui_set_image_resolution()
-: <a class="el" href="gutenprintui_8h.html#a53">gutenprintui.h</a><li>stpui_set_image_type()
-: <a class="el" href="gutenprintui_8h.html#a54">gutenprintui.h</a><li>stpui_set_printrc_file()
-: <a class="el" href="gutenprintui_8h.html#a39">gutenprintui.h</a><li>stpui_set_thumbnail_data()
-: <a class="el" href="gutenprintui_8h.html#a59">gutenprintui.h</a><li>stpui_set_thumbnail_func()
-: <a class="el" href="gutenprintui_8h.html#a57">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#e63acdc3a4074290111bb1cece4437a1">gutenprintui.h</a><li>stpui_compute_orientation()
+: <a class="el" href="gutenprintui_8h.html#25b010dc52c84c5dc5a83b84c4973415">gutenprintui.h</a><li>stpui_curve_get_type()
+: <a class="el" href="curve_8h.html#3eafd87334a70bb87fca2084b558c2b2">curve.h</a><li>stpui_curve_get_vector()
+: <a class="el" href="curve_8h.html#6dfbda8721d6d652ef8f710a696d6367">curve.h</a><li>stpui_curve_new()
+: <a class="el" href="curve_8h.html#23667321d3acf52249e8c18506be017d">curve.h</a><li>stpui_curve_reset()
+: <a class="el" href="curve_8h.html#eb1c0e9894aaa04ade62d050aa5ea15b">curve.h</a><li>stpui_curve_set_curve_type()
+: <a class="el" href="curve_8h.html#9d6d8e461caf28083c2e1b76639c7d24">curve.h</a><li>stpui_curve_set_gamma()
+: <a class="el" href="curve_8h.html#2b8cf1c1a6badf89c3a7b95c87b91a72">curve.h</a><li>stpui_curve_set_range()
+: <a class="el" href="curve_8h.html#3701325c36b957b91b5e2719ffbaa28a">curve.h</a><li>stpui_curve_set_vector()
+: <a class="el" href="curve_8h.html#f611be61b641f4efc9b6044aacf98103">curve.h</a><li>stpui_curve_type_get_type()
+: <a class="el" href="typebuiltins_8h.html#5e570d0225cd4f8ef426d648293dced9">typebuiltins.h</a><li>stpui_do_print_dialog()
+: <a class="el" href="gutenprintui_8h.html#b6ff540cc47781f92bd98d11c609ad96">gutenprintui.h</a><li>stpui_gamma_curve_get_type()
+: <a class="el" href="gammacurve_8h.html#57a0864588671f9b1ed5a64be3a06ed5">gammacurve.h</a><li>stpui_gamma_curve_new()
+: <a class="el" href="gammacurve_8h.html#b3038f4fe63c6035e3f1ec876559d8f9">gammacurve.h</a><li>stpui_get_current_printer()
+: <a class="el" href="gutenprintui_8h.html#8aa89d084c3364396974b7665f5a26f9">gutenprintui.h</a><li>stpui_get_errdata()
+: <a class="el" href="gutenprintui_8h.html#1280f5bad08d4f7ccbfbd64785102ce2">gutenprintui.h</a><li>stpui_get_errfunc()
+: <a class="el" href="gutenprintui_8h.html#92ac2b023b0352cb3d519ece77ccc51c">gutenprintui.h</a><li>stpui_get_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#51decc80a312291c9f99cde8a18393a6">gutenprintui.h</a><li>stpui_get_image_filename()
+: <a class="el" href="gutenprintui_8h.html#b46b5187c4d36188019c556f8685efdc">gutenprintui.h</a><li>stpui_get_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#47f72a1bf50eac641ab4f72af5ed379f">gutenprintui.h</a><li>stpui_get_system_printers()
+: <a class="el" href="gutenprintui_8h.html#35da543417b8be45c11c02c590bf4ef5">gutenprintui.h</a><li>stpui_get_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#eeca67486b0fae3eae3ed8d4c8b6ebe1">gutenprintui.h</a><li>stpui_get_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#e2ae7063801902cb0a4168974d81ab9b">gutenprintui.h</a><li>stpui_plist_add()
+: <a class="el" href="gutenprintui_8h.html#9b28f7223268ab81ff605e733ebf97e5">gutenprintui.h</a><li>stpui_plist_copy()
+: <a class="el" href="gutenprintui_8h.html#a41fef36c0775105b3187708dbd9700a">gutenprintui.h</a><li>stpui_plist_get_command_type()
+: <a class="el" href="gutenprintui_8h.html#2f5b046cd01c6ad5bbccd485165928d7">gutenprintui.h</a><li>stpui_plist_get_copy_count()
+: <a class="el" href="gutenprintui_8h.html#4effa689c6a5e828c672b3feb0c91623">gutenprintui.h</a><li>stpui_plist_get_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#276c7fbf168c1431d8dce2f1393dac09">gutenprintui.h</a><li>stpui_plist_get_custom_command()
+: <a class="el" href="gutenprintui_8h.html#b31d172f0c6755ac149b498800c46141">gutenprintui.h</a><li>stpui_plist_get_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#6b83f5dbcdf2deeef19726e468d7cfe3">gutenprintui.h</a><li>stpui_plist_get_name()
+: <a class="el" href="gutenprintui_8h.html#c70ee1c3425b1a3be74a5dfc3476f079">gutenprintui.h</a><li>stpui_plist_get_output_filename()
+: <a class="el" href="gutenprintui_8h.html#f593816f98fad12bf48d461fe72ff31e">gutenprintui.h</a><li>stpui_plist_get_queue_name()
+: <a class="el" href="gutenprintui_8h.html#aecb54cd0535976fd51b2be080366c22">gutenprintui.h</a><li>stpui_plist_set_command_type()
+: <a class="el" href="gutenprintui_8h.html#b3cfd6a8b492bda54150c716f1631b4f">gutenprintui.h</a><li>stpui_plist_set_copy_count()
+: <a class="el" href="gutenprintui_8h.html#3252b3c283aca1a71da38ae9a7b9b9b5">gutenprintui.h</a><li>stpui_plist_set_current_standard_command()
+: <a class="el" href="gutenprintui_8h.html#c1e81fe45a8a3b4a6cd2682cdc21ddd1">gutenprintui.h</a><li>stpui_plist_set_current_standard_command_n()
+: <a class="el" href="gutenprintui_8h.html#8f7fe530f483f07c08dbe81efebbdb7a">gutenprintui.h</a><li>stpui_plist_set_custom_command()
+: <a class="el" href="gutenprintui_8h.html#5f04be99f3a2d8d788bd929d01823a75">gutenprintui.h</a><li>stpui_plist_set_custom_command_n()
+: <a class="el" href="gutenprintui_8h.html#13c2730e5161bf18e3a31fe4d2bb0b31">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options()
+: <a class="el" href="gutenprintui_8h.html#6fba852c389ed20d9d1da1610d3125db">gutenprintui.h</a><li>stpui_plist_set_extra_printer_options_n()
+: <a class="el" href="gutenprintui_8h.html#b63f9f05403aa8edd3fc9a063d558a88">gutenprintui.h</a><li>stpui_plist_set_name()
+: <a class="el" href="gutenprintui_8h.html#8ad3d342e15a406c942d52a7d5e093b8">gutenprintui.h</a><li>stpui_plist_set_name_n()
+: <a class="el" href="gutenprintui_8h.html#ad9fc64007c7867e05743b6a30664fc4">gutenprintui.h</a><li>stpui_plist_set_output_filename()
+: <a class="el" href="gutenprintui_8h.html#e0e2a359527aded6f2dc60fe6ec5ff55">gutenprintui.h</a><li>stpui_plist_set_output_filename_n()
+: <a class="el" href="gutenprintui_8h.html#8a751b01cba31f15aed8f39ef72f8e37">gutenprintui.h</a><li>stpui_plist_set_queue_name()
+: <a class="el" href="gutenprintui_8h.html#8267cf35fd86b40ce1bddb958bc0828d">gutenprintui.h</a><li>stpui_plist_set_queue_name_n()
+: <a class="el" href="gutenprintui_8h.html#7b54207ec204cbe3327284ac9d56b188">gutenprintui.h</a><li>stpui_print()
+: <a class="el" href="gutenprintui_8h.html#7867f0a4ea47e5f9f80c3463e6029a8a">gutenprintui.h</a><li>stpui_printer_initialize()
+: <a class="el" href="gutenprintui_8h.html#63325efb553d690c83608ad9d75b9c5c">gutenprintui.h</a><li>stpui_printrc_load()
+: <a class="el" href="gutenprintui_8h.html#9768d9e8d5370bdd66710de1df8fe4d3">gutenprintui.h</a><li>stpui_printrc_save()
+: <a class="el" href="gutenprintui_8h.html#ea786257cd4a43a3ab947eb09d19907c">gutenprintui.h</a><li>stpui_set_errdata()
+: <a class="el" href="gutenprintui_8h.html#6bc23edc145044cffc5f9457f759523e">gutenprintui.h</a><li>stpui_set_errfunc()
+: <a class="el" href="gutenprintui_8h.html#cedc4d703e8a6e88243241245748a144">gutenprintui.h</a><li>stpui_set_global_parameter()
+: <a class="el" href="gutenprintui_8h.html#35603794767eb756a784a74220e2e0cb">gutenprintui.h</a><li>stpui_set_image_channel_depth()
+: <a class="el" href="gutenprintui_8h.html#121e36a0905706f7af20b18d76723086">gutenprintui.h</a><li>stpui_set_image_dimensions()
+: <a class="el" href="gutenprintui_8h.html#c064fde3bd665a169a5bcee426fe90ad">gutenprintui.h</a><li>stpui_set_image_filename()
+: <a class="el" href="gutenprintui_8h.html#849dc9d8235aeae8c294ea97d3a2291d">gutenprintui.h</a><li>stpui_set_image_raw_channels()
+: <a class="el" href="gutenprintui_8h.html#9475be2668e339e552bf905b3b377697">gutenprintui.h</a><li>stpui_set_image_resolution()
+: <a class="el" href="gutenprintui_8h.html#58f2ba3797c5bed1328f2bac2aa71531">gutenprintui.h</a><li>stpui_set_image_type()
+: <a class="el" href="gutenprintui_8h.html#310705e065d4ae1b3ed2e1c9c5189b1b">gutenprintui.h</a><li>stpui_set_printrc_file()
+: <a class="el" href="gutenprintui_8h.html#98928c6f53a0322dad08f1057882b2fd">gutenprintui.h</a><li>stpui_set_thumbnail_data()
+: <a class="el" href="gutenprintui_8h.html#da2af8cf724e3bcbd49be2f5d1cd4bc2">gutenprintui.h</a><li>stpui_set_thumbnail_func()
+: <a class="el" href="gutenprintui_8h.html#881c586fa5ec944b157b7cb92c05be7a">gutenprintui.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/globals_type.html b/doc/gutenprintui2/html/globals_type.html
index 39b11fe..57e05c8 100644
--- a/doc/gutenprintui2/html/globals_type.html
+++ b/doc/gutenprintui2/html/globals_type.html
@@ -2,22 +2,43 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Data Fields</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
-<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumerator</a> | <a class="qindex" href="globals_defs.html">Defines</a></div>
-
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li id="current"><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="globals.html"><span>All</span></a></li>
+    <li><a href="globals_func.html"><span>Functions</span></a></li>
+    <li id="current"><a href="globals_type.html"><span>Typedefs</span></a></li>
+    <li><a href="globals_enum.html"><span>Enumerations</span></a></li>
+    <li><a href="globals_eval.html"><span>Enumerator</span></a></li>
+    <li><a href="globals_defs.html"><span>Defines</span></a></li>
+  </ul>
+</div>
+&nbsp;
 <p>
 <ul>
 <li>get_thumbnail_func_t
-: <a class="el" href="gutenprintui_8h.html#a1">gutenprintui.h</a><li>stpui_image_t
-: <a class="el" href="gutenprintui_8h.html#a0">gutenprintui.h</a><li>StpuiCurve
-: <a class="el" href="curve_8h.html#a6">curve.h</a><li>StpuiCurveClass
-: <a class="el" href="curve_8h.html#a7">curve.h</a><li>StpuiGammaCurve
-: <a class="el" href="gammacurve_8h.html#a6">gammacurve.h</a><li>StpuiGammaCurveClass
-: <a class="el" href="gammacurve_8h.html#a7">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+: <a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">gutenprintui.h</a><li>stpui_image_t
+: <a class="el" href="gutenprintui_8h.html#f0f2e236d924323378ded67b3e434dd5">gutenprintui.h</a><li>StpuiCurve
+: <a class="el" href="curve_8h.html#04ae3b4e227fca5f2aa871b0f9e1cab0">curve.h</a><li>StpuiCurveClass
+: <a class="el" href="curve_8h.html#13e6043625efd88837615685f7472e2d">curve.h</a><li>StpuiGammaCurve
+: <a class="el" href="gammacurve_8h.html#e112dc0cc75594e7e8efd332fe2c9c5b">gammacurve.h</a><li>StpuiGammaCurveClass
+: <a class="el" href="gammacurve_8h.html#4ab4956b6af215068a2592a98ae43cbc">gammacurve.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/gutenprintui_8h.html b/doc/gutenprintui2/html/gutenprintui_8h.html
index 4a5e777..697624b 100644
--- a/doc/gutenprintui2/html/gutenprintui_8h.html
+++ b/doc/gutenprintui2/html/gutenprintui_8h.html
@@ -2,11 +2,23 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/gutenprintui.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a></div>
 <h1>gutenprintui.h File Reference</h1><code>#include &lt;gtk/gtk.h&gt;</code><br>
 <code>#include &lt;gutenprint/gutenprint.h&gt;</code><br>
 <code>#include &lt;<a class="el" href="curve_8h.html">gutenprintui2/curve.h</a>&gt;</code><br>
@@ -20,140 +32,140 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">struct &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html">stpui_image</a></td></tr>
 
 <tr><td colspan="2"><br><h2>Typedefs</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a0">stpui_image_t</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef <a class="el" href="structstpui__image.html">stpui_image</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#f0f2e236d924323378ded67b3e434dd5">stpui_image_t</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef guchar *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a> )(void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">typedef guchar *(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a> )(void *data, gint *width, gint *height, gint *bpp, gint page)</td></tr>
 
 <tr><td colspan="2"><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a62">orient_t</a> { <br>
-&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#a62a2">ORIENT_AUTO</a> =  -1, 
-<a class="el" href="gutenprintui_8h.html#a62a3">ORIENT_PORTRAIT</a> =  0, 
-<a class="el" href="gutenprintui_8h.html#a62a4">ORIENT_LANDSCAPE</a> =  1, 
-<a class="el" href="gutenprintui_8h.html#a62a5">ORIENT_UPSIDEDOWN</a> =  2, 
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593">orient_t</a> { <br>
+&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0">ORIENT_AUTO</a> =  -1, 
+<a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80">ORIENT_PORTRAIT</a> =  0, 
+<a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba">ORIENT_LANDSCAPE</a> =  1, 
+<a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88">ORIENT_UPSIDEDOWN</a> =  2, 
 <br>
-&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#a62a6">ORIENT_SEASCAPE</a> =  3
+&nbsp;&nbsp;<a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581">ORIENT_SEASCAPE</a> =  3
 <br>
  }</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a63">command_t</a> { <a class="el" href="gutenprintui_8h.html#a63a7">COMMAND_TYPE_DEFAULT</a>, 
-<a class="el" href="gutenprintui_8h.html#a63a8">COMMAND_TYPE_CUSTOM</a>, 
-<a class="el" href="gutenprintui_8h.html#a63a9">COMMAND_TYPE_FILE</a>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">enum &nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a> { <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb">COMMAND_TYPE_DEFAULT</a>, 
+<a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda">COMMAND_TYPE_CUSTOM</a>, 
+<a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40">COMMAND_TYPE_FILE</a>
  }</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a10">stpui_plist_set_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8ad3d342e15a406c942d52a7d5e093b8">stpui_plist_set_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a11">stpui_plist_set_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ad9fc64007c7867e05743b6a30664fc4">stpui_plist_set_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a12">stpui_plist_get_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#c70ee1c3425b1a3be74a5dfc3476f079">stpui_plist_get_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a13">stpui_plist_set_queue_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8267cf35fd86b40ce1bddb958bc0828d">stpui_plist_set_queue_name</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a14">stpui_plist_set_queue_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#7b54207ec204cbe3327284ac9d56b188">stpui_plist_set_queue_name_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a15">stpui_plist_get_queue_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#aecb54cd0535976fd51b2be080366c22">stpui_plist_get_queue_name</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a16">stpui_plist_set_output_filename</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#e0e2a359527aded6f2dc60fe6ec5ff55">stpui_plist_set_output_filename</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a17">stpui_plist_set_output_filename_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8a751b01cba31f15aed8f39ef72f8e37">stpui_plist_set_output_filename_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a18">stpui_plist_get_output_filename</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#f593816f98fad12bf48d461fe72ff31e">stpui_plist_get_output_filename</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a19">stpui_plist_set_extra_printer_options</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#6fba852c389ed20d9d1da1610d3125db">stpui_plist_set_extra_printer_options</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a20">stpui_plist_set_extra_printer_options_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b63f9f05403aa8edd3fc9a063d558a88">stpui_plist_set_extra_printer_options_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a21">stpui_plist_get_extra_printer_options</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#6b83f5dbcdf2deeef19726e468d7cfe3">stpui_plist_get_extra_printer_options</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a22">stpui_plist_set_custom_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#5f04be99f3a2d8d788bd929d01823a75">stpui_plist_set_custom_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a23">stpui_plist_set_custom_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#13c2730e5161bf18e3a31fe4d2bb0b31">stpui_plist_set_custom_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a24">stpui_plist_get_custom_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b31d172f0c6755ac149b498800c46141">stpui_plist_get_custom_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a25">stpui_plist_set_copy_count</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, gint count)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#3252b3c283aca1a71da38ae9a7b9b9b5">stpui_plist_set_copy_count</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, gint count)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a26">stpui_plist_get_copy_count</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#4effa689c6a5e828c672b3feb0c91623">stpui_plist_get_copy_count</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a27">stpui_plist_set_current_standard_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#c1e81fe45a8a3b4a6cd2682cdc21ddd1">stpui_plist_set_current_standard_command</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a28">stpui_plist_set_current_standard_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8f7fe530f483f07c08dbe81efebbdb7a">stpui_plist_set_current_standard_command_n</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, const char *val, int n)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a29">stpui_plist_get_current_standard_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#276c7fbf168c1431d8dce2f1393dac09">stpui_plist_get_current_standard_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a30">stpui_plist_set_command_type</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, <a class="el" href="gutenprintui_8h.html#a63">command_t</a> val)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b3cfd6a8b492bda54150c716f1631b4f">stpui_plist_set_command_type</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p, <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a> val)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a31">stpui_plist_get_command_type</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#2f5b046cd01c6ad5bbccd485165928d7">stpui_plist_get_command_type</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *p)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a32">stpui_set_global_parameter</a> (const char *param, const char *value)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#35603794767eb756a784a74220e2e0cb">stpui_set_global_parameter</a> (const char *param, const char *value)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a33">stpui_get_global_parameter</a> (const char *param)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#51decc80a312291c9f99cde8a18393a6">stpui_get_global_parameter</a> (const char *param)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a34">stpui_plist_copy</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vd, const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vs)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a41fef36c0775105b3187708dbd9700a">stpui_plist_copy</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vd, const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *vs)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a35">stpui_plist_add</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *key, int add_only)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#9b28f7223268ab81ff605e733ebf97e5">stpui_plist_add</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *key, int add_only)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a36">stpui_printer_initialize</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#63325efb553d690c83608ad9d75b9c5c">stpui_printer_initialize</a> (<a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a37">stpui_get_current_printer</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#8aa89d084c3364396974b7665f5a26f9">stpui_get_current_printer</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a38">stpui_build_standard_print_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *plist, const stp_printer_t *printer)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#e63acdc3a4074290111bb1cece4437a1">stpui_build_standard_print_command</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *plist, const stp_printer_t *printer)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a39">stpui_set_printrc_file</a> (const char *name)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#98928c6f53a0322dad08f1057882b2fd">stpui_set_printrc_file</a> (const char *name)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a40">stpui_get_printrc_file</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#47f72a1bf50eac641ab4f72af5ed379f">stpui_get_printrc_file</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a41">stpui_printrc_load</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#9768d9e8d5370bdd66710de1df8fe4d3">stpui_printrc_load</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a42">stpui_get_system_printers</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#35da543417b8be45c11c02c590bf4ef5">stpui_get_system_printers</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a43">stpui_printrc_save</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#ea786257cd4a43a3ab947eb09d19907c">stpui_printrc_save</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a44">stpui_set_image_filename</a> (const char *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#849dc9d8235aeae8c294ea97d3a2291d">stpui_set_image_filename</a> (const char *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a45">stpui_get_image_filename</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">const char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b46b5187c4d36188019c556f8685efdc">stpui_get_image_filename</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a46">stpui_set_errfunc</a> (stp_outfunc_t wfunc)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#cedc4d703e8a6e88243241245748a144">stpui_set_errfunc</a> (stp_outfunc_t wfunc)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_outfunc_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a47">stpui_get_errfunc</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_outfunc_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#92ac2b023b0352cb3d519ece77ccc51c">stpui_get_errfunc</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a48">stpui_set_errdata</a> (void *errdata)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#6bc23edc145044cffc5f9457f759523e">stpui_set_errdata</a> (void *errdata)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a49">stpui_get_errdata</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#1280f5bad08d4f7ccbfbd64785102ce2">stpui_get_errdata</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a50">stpui_do_print_dialog</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#b6ff540cc47781f92bd98d11c609ad96">stpui_do_print_dialog</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a51">stpui_compute_orientation</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#25b010dc52c84c5dc5a83b84c4973415">stpui_compute_orientation</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a52">stpui_set_image_dimensions</a> (gint width, gint height)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#c064fde3bd665a169a5bcee426fe90ad">stpui_set_image_dimensions</a> (gint width, gint height)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a53">stpui_set_image_resolution</a> (gdouble xres, gdouble yres)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#58f2ba3797c5bed1328f2bac2aa71531">stpui_set_image_resolution</a> (gdouble xres, gdouble yres)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a54">stpui_set_image_type</a> (const char *image_type)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#310705e065d4ae1b3ed2e1c9c5189b1b">stpui_set_image_type</a> (const char *image_type)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a55">stpui_set_image_raw_channels</a> (gint channels)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#9475be2668e339e552bf905b3b377697">stpui_set_image_raw_channels</a> (gint channels)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a56">stpui_set_image_channel_depth</a> (gint bit_depth)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#121e36a0905706f7af20b18d76723086">stpui_set_image_channel_depth</a> (gint bit_depth)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a57">stpui_set_thumbnail_func</a> (<a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#881c586fa5ec944b157b7cb92c05be7a">stpui_set_thumbnail_func</a> (<a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a>)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a58">stpui_get_thumbnail_func</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#e2ae7063801902cb0a4168974d81ab9b">stpui_get_thumbnail_func</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a59">stpui_set_thumbnail_data</a> (void *)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#da2af8cf724e3bcbd49be2f5d1cd4bc2">stpui_set_thumbnail_data</a> (void *)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a60">stpui_get_thumbnail_data</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#eeca67486b0fae3eae3ed8d4c8b6ebe1">stpui_get_thumbnail_data</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#a61">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image.html">stpui_image_t</a> *im)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="gutenprintui_8h.html#7867f0a4ea47e5f9f80c3463e6029a8a">stpui_print</a> (const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *printer, <a class="el" href="structstpui__image.html">stpui_image_t</a> *im)</td></tr>
 
 </table>
 <hr><h2>Typedef Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="gutenprintui.h::get_thumbnail_func_t" ref="a1" args=")(void *data, gint *width, gint *height, gint *bpp, gint page)" --><p>
+<a class="anchor" name="6867fbda8dc5650678af5a23979386b8"></a><!-- doxytag: member="gutenprintui.h::get_thumbnail_func_t" ref="6867fbda8dc5650678af5a23979386b8" args=")(void *data, gint *width, gint *height, gint *bpp, gint page)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">typedef guchar*(* <a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>)(void *data, gint *width, gint *height, gint *bpp, gint page)          </td>
+          <td class="md" nowrap valign="top">typedef guchar*(* <a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a>)(void *data, gint *width, gint *height, gint *bpp, gint page)          </td>
         </tr>
       </table>
     </td>
@@ -170,7 +182,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="a0" args="" --><p>
+<a class="anchor" name="f0f2e236d924323378ded67b3e434dd5"></a><!-- doxytag: member="gutenprintui.h::stpui_image_t" ref="f0f2e236d924323378ded67b3e434dd5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -194,13 +206,13 @@
   </tr>
 </table>
 <hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a63"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="a63" args="" --><p>
+<a class="anchor" name="1d9b1ad69ddba33dc7f51bf85792777d"></a><!-- doxytag: member="gutenprintui.h::command_t" ref="1d9b1ad69ddba33dc7f51bf85792777d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#a63">command_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -216,24 +228,24 @@
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a63a7"></a><!-- doxytag: member="COMMAND_TYPE_DEFAULT" ref="a63a7" args="" -->COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb"></a><!-- doxytag: member="COMMAND_TYPE_DEFAULT" ref="1d9b1ad69ddba33dc7f51bf85792777de8968fd1ea61243b41d783dc1a8a3bfb" args="" -->COMMAND_TYPE_DEFAULT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a63a8"></a><!-- doxytag: member="COMMAND_TYPE_CUSTOM" ref="a63a8" args="" -->COMMAND_TYPE_CUSTOM</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda"></a><!-- doxytag: member="COMMAND_TYPE_CUSTOM" ref="1d9b1ad69ddba33dc7f51bf85792777d950ffcaaf0cd1ae6a5eeff2bdcc93cda" args="" -->COMMAND_TYPE_CUSTOM</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a63a9"></a><!-- doxytag: member="COMMAND_TYPE_FILE" ref="a63a9" args="" -->COMMAND_TYPE_FILE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40"></a><!-- doxytag: member="COMMAND_TYPE_FILE" ref="1d9b1ad69ddba33dc7f51bf85792777da0c9f5896feee455150bda141bfd3f40" args="" -->COMMAND_TYPE_FILE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
     </td>
   </tr>
 </table>
-<a class="anchor" name="a62"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="a62" args="" --><p>
+<a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f29593"></a><!-- doxytag: member="gutenprintui.h::orient_t" ref="b72dd018d9f09ee35f7ac40fc7f29593" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#a62">orient_t</a>          </td>
+          <td class="md" nowrap valign="top">enum <a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593">orient_t</a>          </td>
         </tr>
       </table>
     </td>
@@ -249,15 +261,15 @@
 <p>
 <dl compact><dt><b>Enumerator: </b></dt><dd>
 <table border="0" cellspacing="2" cellpadding="0">
-<tr><td valign="top"><em><a class="anchor" name="a62a2"></a><!-- doxytag: member="ORIENT_AUTO" ref="a62a2" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0"></a><!-- doxytag: member="ORIENT_AUTO" ref="b72dd018d9f09ee35f7ac40fc7f29593c90c0226859f895bd60176c7d414e4f0" args="" -->ORIENT_AUTO</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a3"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="a62a3" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80"></a><!-- doxytag: member="ORIENT_PORTRAIT" ref="b72dd018d9f09ee35f7ac40fc7f295939e273eeca1c05d1a25e93ea977149f80" args="" -->ORIENT_PORTRAIT</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a4"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="a62a4" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba"></a><!-- doxytag: member="ORIENT_LANDSCAPE" ref="b72dd018d9f09ee35f7ac40fc7f2959329a34c1af72e3dc2ccdea5213fe5adba" args="" -->ORIENT_LANDSCAPE</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a5"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="a62a5" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88"></a><!-- doxytag: member="ORIENT_UPSIDEDOWN" ref="b72dd018d9f09ee35f7ac40fc7f2959344c3bb5aa3e545544bcce606de1d8b88" args="" -->ORIENT_UPSIDEDOWN</em>&nbsp;</td><td>
 </td></tr>
-<tr><td valign="top"><em><a class="anchor" name="a62a6"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="a62a6" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
+<tr><td valign="top"><em><a class="anchor" name="b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581"></a><!-- doxytag: member="ORIENT_SEASCAPE" ref="b72dd018d9f09ee35f7ac40fc7f295930fbc603793f9c083933e46d13daa2581" args="" -->ORIENT_SEASCAPE</em>&nbsp;</td><td>
 </td></tr>
 </table>
 </dl>
@@ -265,7 +277,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a38"></a><!-- doxytag: member="gutenprintui.h::stpui_build_standard_print_command" ref="a38" args="(const stpui_plist_t *plist, const stp_printer_t *printer)" --><p>
+<a class="anchor" name="e63acdc3a4074290111bb1cece4437a1"></a><!-- doxytag: member="gutenprintui.h::stpui_build_standard_print_command" ref="e63acdc3a4074290111bb1cece4437a1" args="(const stpui_plist_t *plist, const stp_printer_t *printer)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -302,7 +314,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a51"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="a51" args="(void)" --><p>
+<a class="anchor" name="25b010dc52c84c5dc5a83b84c4973415"></a><!-- doxytag: member="gutenprintui.h::stpui_compute_orientation" ref="25b010dc52c84c5dc5a83b84c4973415" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -330,7 +342,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a50"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="a50" args="(void)" --><p>
+<a class="anchor" name="b6ff540cc47781f92bd98d11c609ad96"></a><!-- doxytag: member="gutenprintui.h::stpui_do_print_dialog" ref="b6ff540cc47781f92bd98d11c609ad96" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -358,7 +370,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a37"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="a37" args="(void)" --><p>
+<a class="anchor" name="8aa89d084c3364396974b7665f5a26f9"></a><!-- doxytag: member="gutenprintui.h::stpui_get_current_printer" ref="8aa89d084c3364396974b7665f5a26f9" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -386,7 +398,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a49"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="a49" args="(void)" --><p>
+<a class="anchor" name="1280f5bad08d4f7ccbfbd64785102ce2"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errdata" ref="1280f5bad08d4f7ccbfbd64785102ce2" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -414,7 +426,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a47"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="a47" args="(void)" --><p>
+<a class="anchor" name="92ac2b023b0352cb3d519ece77ccc51c"></a><!-- doxytag: member="gutenprintui.h::stpui_get_errfunc" ref="92ac2b023b0352cb3d519ece77ccc51c" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -442,7 +454,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a33"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="a33" args="(const char *param)" --><p>
+<a class="anchor" name="51decc80a312291c9f99cde8a18393a6"></a><!-- doxytag: member="gutenprintui.h::stpui_get_global_parameter" ref="51decc80a312291c9f99cde8a18393a6" args="(const char *param)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -470,7 +482,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a45"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="a45" args="(void)" --><p>
+<a class="anchor" name="b46b5187c4d36188019c556f8685efdc"></a><!-- doxytag: member="gutenprintui.h::stpui_get_image_filename" ref="b46b5187c4d36188019c556f8685efdc" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -498,7 +510,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a40"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="a40" args="(void)" --><p>
+<a class="anchor" name="47f72a1bf50eac641ab4f72af5ed379f"></a><!-- doxytag: member="gutenprintui.h::stpui_get_printrc_file" ref="47f72a1bf50eac641ab4f72af5ed379f" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -526,7 +538,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a42"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="a42" args="(void)" --><p>
+<a class="anchor" name="35da543417b8be45c11c02c590bf4ef5"></a><!-- doxytag: member="gutenprintui.h::stpui_get_system_printers" ref="35da543417b8be45c11c02c590bf4ef5" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -554,7 +566,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a60"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="a60" args="(void)" --><p>
+<a class="anchor" name="eeca67486b0fae3eae3ed8d4c8b6ebe1"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_data" ref="eeca67486b0fae3eae3ed8d4c8b6ebe1" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -582,13 +594,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a58"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="a58" args="(void)" --><p>
+<a class="anchor" name="e2ae7063801902cb0a4168974d81ab9b"></a><!-- doxytag: member="gutenprintui.h::stpui_get_thumbnail_func" ref="e2ae7063801902cb0a4168974d81ab9b" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a> stpui_get_thumbnail_func           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a> stpui_get_thumbnail_func           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">void&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
@@ -610,7 +622,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a35"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_add" ref="a35" args="(const stpui_plist_t *key, int add_only)" --><p>
+<a class="anchor" name="9b28f7223268ab81ff605e733ebf97e5"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_add" ref="9b28f7223268ab81ff605e733ebf97e5" args="(const stpui_plist_t *key, int add_only)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -647,7 +659,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a34"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_copy" ref="a34" args="(stpui_plist_t *vd, const stpui_plist_t *vs)" --><p>
+<a class="anchor" name="a41fef36c0775105b3187708dbd9700a"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_copy" ref="a41fef36c0775105b3187708dbd9700a" args="(stpui_plist_t *vd, const stpui_plist_t *vs)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -684,13 +696,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a31"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="a31" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="2f5b046cd01c6ad5bbccd485165928d7"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_command_type" ref="2f5b046cd01c6ad5bbccd485165928d7" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a> stpui_plist_get_command_type           </td>
+          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a> stpui_plist_get_command_type           </td>
           <td class="md" valign="top">(&nbsp;</td>
           <td class="md" nowrap valign="top">const <a class="el" href="structstpui__plist__t.html">stpui_plist_t</a> *&nbsp;</td>
           <td class="mdname1" valign="top" nowrap> <em>p</em>          </td>
@@ -712,7 +724,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a26"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="a26" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="4effa689c6a5e828c672b3feb0c91623"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_copy_count" ref="4effa689c6a5e828c672b3feb0c91623" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -740,7 +752,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a29"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_current_standard_command" ref="a29" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="276c7fbf168c1431d8dce2f1393dac09"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_current_standard_command" ref="276c7fbf168c1431d8dce2f1393dac09" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -768,7 +780,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a24"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="a24" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="b31d172f0c6755ac149b498800c46141"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_custom_command" ref="b31d172f0c6755ac149b498800c46141" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -796,7 +808,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a21"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_extra_printer_options" ref="a21" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="6b83f5dbcdf2deeef19726e468d7cfe3"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_extra_printer_options" ref="6b83f5dbcdf2deeef19726e468d7cfe3" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -824,7 +836,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a12"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="a12" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="c70ee1c3425b1a3be74a5dfc3476f079"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_name" ref="c70ee1c3425b1a3be74a5dfc3476f079" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -852,7 +864,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a18"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="a18" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="f593816f98fad12bf48d461fe72ff31e"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_output_filename" ref="f593816f98fad12bf48d461fe72ff31e" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -880,7 +892,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a15"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="a15" args="(const stpui_plist_t *p)" --><p>
+<a class="anchor" name="aecb54cd0535976fd51b2be080366c22"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_get_queue_name" ref="aecb54cd0535976fd51b2be080366c22" args="(const stpui_plist_t *p)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -908,7 +920,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a30"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_command_type" ref="a30" args="(stpui_plist_t *p, command_t val)" --><p>
+<a class="anchor" name="b3cfd6a8b492bda54150c716f1631b4f"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_command_type" ref="b3cfd6a8b492bda54150c716f1631b4f" args="(stpui_plist_t *p, command_t val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -922,7 +934,7 @@
         <tr>
           <td class="md" nowrap align="right"></td>
           <td class="md"></td>
-          <td class="md" nowrap><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td>
+          <td class="md" nowrap><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a>&nbsp;</td>
           <td class="mdname" nowrap> <em>val</em></td>
         </tr>
         <tr>
@@ -945,7 +957,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a25"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_copy_count" ref="a25" args="(stpui_plist_t *p, gint count)" --><p>
+<a class="anchor" name="3252b3c283aca1a71da38ae9a7b9b9b5"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_copy_count" ref="3252b3c283aca1a71da38ae9a7b9b9b5" args="(stpui_plist_t *p, gint count)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -982,7 +994,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a27"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command" ref="a27" args="(stpui_plist_t *p, const char *val)" --><p>
+<a class="anchor" name="c1e81fe45a8a3b4a6cd2682cdc21ddd1"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command" ref="c1e81fe45a8a3b4a6cd2682cdc21ddd1" args="(stpui_plist_t *p, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1019,7 +1031,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a28"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command_n" ref="a28" args="(stpui_plist_t *p, const char *val, int n)" --><p>
+<a class="anchor" name="8f7fe530f483f07c08dbe81efebbdb7a"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_current_standard_command_n" ref="8f7fe530f483f07c08dbe81efebbdb7a" args="(stpui_plist_t *p, const char *val, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1062,7 +1074,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a22"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command" ref="a22" args="(stpui_plist_t *p, const char *val)" --><p>
+<a class="anchor" name="5f04be99f3a2d8d788bd929d01823a75"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command" ref="5f04be99f3a2d8d788bd929d01823a75" args="(stpui_plist_t *p, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1099,7 +1111,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a23"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command_n" ref="a23" args="(stpui_plist_t *p, const char *val, int n)" --><p>
+<a class="anchor" name="13c2730e5161bf18e3a31fe4d2bb0b31"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_custom_command_n" ref="13c2730e5161bf18e3a31fe4d2bb0b31" args="(stpui_plist_t *p, const char *val, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1142,7 +1154,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a19"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options" ref="a19" args="(stpui_plist_t *p, const char *val)" --><p>
+<a class="anchor" name="6fba852c389ed20d9d1da1610d3125db"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options" ref="6fba852c389ed20d9d1da1610d3125db" args="(stpui_plist_t *p, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1179,7 +1191,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a20"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options_n" ref="a20" args="(stpui_plist_t *p, const char *val, int n)" --><p>
+<a class="anchor" name="b63f9f05403aa8edd3fc9a063d558a88"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_extra_printer_options_n" ref="b63f9f05403aa8edd3fc9a063d558a88" args="(stpui_plist_t *p, const char *val, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1222,7 +1234,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a10"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name" ref="a10" args="(stpui_plist_t *p, const char *val)" --><p>
+<a class="anchor" name="8ad3d342e15a406c942d52a7d5e093b8"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name" ref="8ad3d342e15a406c942d52a7d5e093b8" args="(stpui_plist_t *p, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1259,7 +1271,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a11"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name_n" ref="a11" args="(stpui_plist_t *p, const char *val, int n)" --><p>
+<a class="anchor" name="ad9fc64007c7867e05743b6a30664fc4"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_name_n" ref="ad9fc64007c7867e05743b6a30664fc4" args="(stpui_plist_t *p, const char *val, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1302,7 +1314,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a16"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename" ref="a16" args="(stpui_plist_t *p, const char *val)" --><p>
+<a class="anchor" name="e0e2a359527aded6f2dc60fe6ec5ff55"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename" ref="e0e2a359527aded6f2dc60fe6ec5ff55" args="(stpui_plist_t *p, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1339,7 +1351,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a17"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename_n" ref="a17" args="(stpui_plist_t *p, const char *val, int n)" --><p>
+<a class="anchor" name="8a751b01cba31f15aed8f39ef72f8e37"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_output_filename_n" ref="8a751b01cba31f15aed8f39ef72f8e37" args="(stpui_plist_t *p, const char *val, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1382,7 +1394,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a13"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name" ref="a13" args="(stpui_plist_t *p, const char *val)" --><p>
+<a class="anchor" name="8267cf35fd86b40ce1bddb958bc0828d"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name" ref="8267cf35fd86b40ce1bddb958bc0828d" args="(stpui_plist_t *p, const char *val)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1419,7 +1431,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a14"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name_n" ref="a14" args="(stpui_plist_t *p, const char *val, int n)" --><p>
+<a class="anchor" name="7b54207ec204cbe3327284ac9d56b188"></a><!-- doxytag: member="gutenprintui.h::stpui_plist_set_queue_name_n" ref="7b54207ec204cbe3327284ac9d56b188" args="(stpui_plist_t *p, const char *val, int n)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1462,7 +1474,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a61"></a><!-- doxytag: member="gutenprintui.h::stpui_print" ref="a61" args="(const stpui_plist_t *printer, stpui_image_t *im)" --><p>
+<a class="anchor" name="7867f0a4ea47e5f9f80c3463e6029a8a"></a><!-- doxytag: member="gutenprintui.h::stpui_print" ref="7867f0a4ea47e5f9f80c3463e6029a8a" args="(const stpui_plist_t *printer, stpui_image_t *im)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1499,7 +1511,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a36"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="a36" args="(stpui_plist_t *printer)" --><p>
+<a class="anchor" name="63325efb553d690c83608ad9d75b9c5c"></a><!-- doxytag: member="gutenprintui.h::stpui_printer_initialize" ref="63325efb553d690c83608ad9d75b9c5c" args="(stpui_plist_t *printer)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1527,7 +1539,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a41"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="a41" args="(void)" --><p>
+<a class="anchor" name="9768d9e8d5370bdd66710de1df8fe4d3"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_load" ref="9768d9e8d5370bdd66710de1df8fe4d3" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1555,7 +1567,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a43"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="a43" args="(void)" --><p>
+<a class="anchor" name="ea786257cd4a43a3ab947eb09d19907c"></a><!-- doxytag: member="gutenprintui.h::stpui_printrc_save" ref="ea786257cd4a43a3ab947eb09d19907c" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1583,7 +1595,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a48"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="a48" args="(void *errdata)" --><p>
+<a class="anchor" name="6bc23edc145044cffc5f9457f759523e"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errdata" ref="6bc23edc145044cffc5f9457f759523e" args="(void *errdata)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1611,7 +1623,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a46"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="a46" args="(stp_outfunc_t wfunc)" --><p>
+<a class="anchor" name="cedc4d703e8a6e88243241245748a144"></a><!-- doxytag: member="gutenprintui.h::stpui_set_errfunc" ref="cedc4d703e8a6e88243241245748a144" args="(stp_outfunc_t wfunc)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1639,7 +1651,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a32"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="a32" args="(const char *param, const char *value)" --><p>
+<a class="anchor" name="35603794767eb756a784a74220e2e0cb"></a><!-- doxytag: member="gutenprintui.h::stpui_set_global_parameter" ref="35603794767eb756a784a74220e2e0cb" args="(const char *param, const char *value)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1676,7 +1688,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a56"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="a56" args="(gint bit_depth)" --><p>
+<a class="anchor" name="121e36a0905706f7af20b18d76723086"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_channel_depth" ref="121e36a0905706f7af20b18d76723086" args="(gint bit_depth)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1704,7 +1716,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a52"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="a52" args="(gint width, gint height)" --><p>
+<a class="anchor" name="c064fde3bd665a169a5bcee426fe90ad"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_dimensions" ref="c064fde3bd665a169a5bcee426fe90ad" args="(gint width, gint height)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1741,7 +1753,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a44"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="a44" args="(const char *)" --><p>
+<a class="anchor" name="849dc9d8235aeae8c294ea97d3a2291d"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_filename" ref="849dc9d8235aeae8c294ea97d3a2291d" args="(const char *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1769,7 +1781,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a55"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="a55" args="(gint channels)" --><p>
+<a class="anchor" name="9475be2668e339e552bf905b3b377697"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_raw_channels" ref="9475be2668e339e552bf905b3b377697" args="(gint channels)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1797,7 +1809,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a53"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="a53" args="(gdouble xres, gdouble yres)" --><p>
+<a class="anchor" name="58f2ba3797c5bed1328f2bac2aa71531"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_resolution" ref="58f2ba3797c5bed1328f2bac2aa71531" args="(gdouble xres, gdouble yres)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1834,7 +1846,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a54"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="a54" args="(const char *image_type)" --><p>
+<a class="anchor" name="310705e065d4ae1b3ed2e1c9c5189b1b"></a><!-- doxytag: member="gutenprintui.h::stpui_set_image_type" ref="310705e065d4ae1b3ed2e1c9c5189b1b" args="(const char *image_type)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1862,7 +1874,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a39"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="a39" args="(const char *name)" --><p>
+<a class="anchor" name="98928c6f53a0322dad08f1057882b2fd"></a><!-- doxytag: member="gutenprintui.h::stpui_set_printrc_file" ref="98928c6f53a0322dad08f1057882b2fd" args="(const char *name)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1890,7 +1902,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a59"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="a59" args="(void *)" --><p>
+<a class="anchor" name="da2af8cf724e3bcbd49be2f5d1cd4bc2"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_data" ref="da2af8cf724e3bcbd49be2f5d1cd4bc2" args="(void *)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1918,7 +1930,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a57"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="a57" args="(get_thumbnail_func_t)" --><p>
+<a class="anchor" name="881c586fa5ec944b157b7cb92c05be7a"></a><!-- doxytag: member="gutenprintui.h::stpui_set_thumbnail_func" ref="881c586fa5ec944b157b7cb92c05be7a" args="(get_thumbnail_func_t)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -1926,7 +1938,7 @@
         <tr>
           <td class="md" nowrap valign="top">void stpui_set_thumbnail_func           </td>
           <td class="md" valign="top">(&nbsp;</td>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a1">get_thumbnail_func_t</a>&nbsp;</td>
+          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#6867fbda8dc5650678af5a23979386b8">get_thumbnail_func_t</a>&nbsp;</td>
           <td class="mdname1" valign="top" nowrap>          </td>
           <td class="md" valign="top">&nbsp;)&nbsp;</td>
           <td class="md" nowrap></td>
@@ -1946,8 +1958,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/index.html b/doc/gutenprintui2/html/index.html
index bf21c5b..50eaff3 100644
--- a/doc/gutenprintui2/html/index.html
+++ b/doc/gutenprintui2/html/index.html
@@ -2,13 +2,20 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: Main Page</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindexHL" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li id="current"><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
 <h1>libgutenprintui2 API Reference Documentation</h1>
 <p>
-<h3 align="center">5.0.0-rc1 </h3><hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<h3 align="center">5.0.0-rc2 </h3><hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurve.html b/doc/gutenprintui2/html/struct__StpuiCurve.html
index b0e0aba..f5ec280 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurve.html
@@ -2,53 +2,66 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: _StpuiCurve Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>_StpuiCurve Struct Reference</h1><!-- doxytag: class="_StpuiCurve" --><code>#include &lt;curve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingArea&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o0">graph</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingArea&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#f8b0b924ebd7046dbfa85a856e4682c8">graph</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o1">cursor_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#aeb92d99e85efb4bafc8170ff337d9a5">cursor_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o2">min_x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#42911f1fe1166d1441b07b5df42cc5c8">min_x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o3">max_x</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#2cc8505f392b3757b8e289d83c321693">max_x</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o4">min_y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#6557fd2c11b2f6a56a5ab6bbb85cbc19">min_y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o5">max_y</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#2c34fcda6babf4933d253ae6cd7c9419">max_y</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPixmap *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o6">pixmap</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPixmap *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#8580443f4197aa43eeb23b41f3984de3">pixmap</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="curve_8h.html#a19">StpuiCurveType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o7">curve_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#a15d0c7b1a08ed0fb3e8675f60ceeb63">curve_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o8">height</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#b435e227d5dd201e1768b2bcb2e0aa81">height</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o9">grab_point</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#87568e046fdaaa74725653dc4de489fb">grab_point</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o10">last</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#98bd1c45684cf587ac2347a92dd7bb51">last</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o11">num_points</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#041da0cf21a17db4fedb8045c0eacdb3">num_points</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPoint *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o12">point</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GdkPoint *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#78ee54aa8f813885fe2fe20d232518b9">point</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o13">num_ctlpoints</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gint&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#7268e58fecac8344b32a31da68b341ec">num_ctlpoints</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#o14">ctlpoint</a> )[2]</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurve.html#b4de71fdc43c7448028e425034663828">ctlpoint</a> )[2]</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o14"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="o14" args=")[2]" --><p>
+<a class="anchor" name="b4de71fdc43c7448028e425034663828"></a><!-- doxytag: member="_StpuiCurve::ctlpoint" ref="b4de71fdc43c7448028e425034663828" args=")[2]" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gfloat(* <a class="el" href="struct__StpuiCurve.html#o14">_StpuiCurve::ctlpoint</a>)[2]          </td>
+          <td class="md" nowrap valign="top">gfloat(* <a class="el" href="struct__StpuiCurve.html#b4de71fdc43c7448028e425034663828">_StpuiCurve::ctlpoint</a>)[2]          </td>
         </tr>
       </table>
     </td>
@@ -65,13 +78,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="o1" args="" --><p>
+<a class="anchor" name="aeb92d99e85efb4bafc8170ff337d9a5"></a><!-- doxytag: member="_StpuiCurve::cursor_type" ref="aeb92d99e85efb4bafc8170ff337d9a5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o1">_StpuiCurve::cursor_type</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#aeb92d99e85efb4bafc8170ff337d9a5">_StpuiCurve::cursor_type</a>          </td>
         </tr>
       </table>
     </td>
@@ -88,13 +101,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="o7" args="" --><p>
+<a class="anchor" name="a15d0c7b1a08ed0fb3e8675f60ceeb63"></a><!-- doxytag: member="_StpuiCurve::curve_type" ref="a15d0c7b1a08ed0fb3e8675f60ceeb63" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="curve_8h.html#a19">StpuiCurveType</a> <a class="el" href="struct__StpuiCurve.html#o7">_StpuiCurve::curve_type</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="curve_8h.html#7d44faf53d74002f61d5805ac34d968e">StpuiCurveType</a> <a class="el" href="struct__StpuiCurve.html#a15d0c7b1a08ed0fb3e8675f60ceeb63">_StpuiCurve::curve_type</a>          </td>
         </tr>
       </table>
     </td>
@@ -111,13 +124,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="o9" args="" --><p>
+<a class="anchor" name="87568e046fdaaa74725653dc4de489fb"></a><!-- doxytag: member="_StpuiCurve::grab_point" ref="87568e046fdaaa74725653dc4de489fb" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o9">_StpuiCurve::grab_point</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#87568e046fdaaa74725653dc4de489fb">_StpuiCurve::grab_point</a>          </td>
         </tr>
       </table>
     </td>
@@ -134,13 +147,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiCurve::graph" ref="o0" args="" --><p>
+<a class="anchor" name="f8b0b924ebd7046dbfa85a856e4682c8"></a><!-- doxytag: member="_StpuiCurve::graph" ref="f8b0b924ebd7046dbfa85a856e4682c8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkDrawingArea <a class="el" href="struct__StpuiCurve.html#o0">_StpuiCurve::graph</a>          </td>
+          <td class="md" nowrap valign="top">GtkDrawingArea <a class="el" href="struct__StpuiCurve.html#f8b0b924ebd7046dbfa85a856e4682c8">_StpuiCurve::graph</a>          </td>
         </tr>
       </table>
     </td>
@@ -157,13 +170,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="_StpuiCurve::height" ref="o8" args="" --><p>
+<a class="anchor" name="b435e227d5dd201e1768b2bcb2e0aa81"></a><!-- doxytag: member="_StpuiCurve::height" ref="b435e227d5dd201e1768b2bcb2e0aa81" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o8">_StpuiCurve::height</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#b435e227d5dd201e1768b2bcb2e0aa81">_StpuiCurve::height</a>          </td>
         </tr>
       </table>
     </td>
@@ -180,13 +193,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o10"></a><!-- doxytag: member="_StpuiCurve::last" ref="o10" args="" --><p>
+<a class="anchor" name="98bd1c45684cf587ac2347a92dd7bb51"></a><!-- doxytag: member="_StpuiCurve::last" ref="98bd1c45684cf587ac2347a92dd7bb51" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o10">_StpuiCurve::last</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#98bd1c45684cf587ac2347a92dd7bb51">_StpuiCurve::last</a>          </td>
         </tr>
       </table>
     </td>
@@ -203,13 +216,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="o3" args="" --><p>
+<a class="anchor" name="2cc8505f392b3757b8e289d83c321693"></a><!-- doxytag: member="_StpuiCurve::max_x" ref="2cc8505f392b3757b8e289d83c321693" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o3">_StpuiCurve::max_x</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#2cc8505f392b3757b8e289d83c321693">_StpuiCurve::max_x</a>          </td>
         </tr>
       </table>
     </td>
@@ -226,13 +239,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="o5" args="" --><p>
+<a class="anchor" name="2c34fcda6babf4933d253ae6cd7c9419"></a><!-- doxytag: member="_StpuiCurve::max_y" ref="2c34fcda6babf4933d253ae6cd7c9419" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o5">_StpuiCurve::max_y</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#2c34fcda6babf4933d253ae6cd7c9419">_StpuiCurve::max_y</a>          </td>
         </tr>
       </table>
     </td>
@@ -249,13 +262,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="o2" args="" --><p>
+<a class="anchor" name="42911f1fe1166d1441b07b5df42cc5c8"></a><!-- doxytag: member="_StpuiCurve::min_x" ref="42911f1fe1166d1441b07b5df42cc5c8" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o2">_StpuiCurve::min_x</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#42911f1fe1166d1441b07b5df42cc5c8">_StpuiCurve::min_x</a>          </td>
         </tr>
       </table>
     </td>
@@ -272,13 +285,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="o4" args="" --><p>
+<a class="anchor" name="6557fd2c11b2f6a56a5ab6bbb85cbc19"></a><!-- doxytag: member="_StpuiCurve::min_y" ref="6557fd2c11b2f6a56a5ab6bbb85cbc19" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#o4">_StpuiCurve::min_y</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiCurve.html#6557fd2c11b2f6a56a5ab6bbb85cbc19">_StpuiCurve::min_y</a>          </td>
         </tr>
       </table>
     </td>
@@ -295,13 +308,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o13"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="o13" args="" --><p>
+<a class="anchor" name="7268e58fecac8344b32a31da68b341ec"></a><!-- doxytag: member="_StpuiCurve::num_ctlpoints" ref="7268e58fecac8344b32a31da68b341ec" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o13">_StpuiCurve::num_ctlpoints</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#7268e58fecac8344b32a31da68b341ec">_StpuiCurve::num_ctlpoints</a>          </td>
         </tr>
       </table>
     </td>
@@ -318,13 +331,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="o11" args="" --><p>
+<a class="anchor" name="041da0cf21a17db4fedb8045c0eacdb3"></a><!-- doxytag: member="_StpuiCurve::num_points" ref="041da0cf21a17db4fedb8045c0eacdb3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#o11">_StpuiCurve::num_points</a>          </td>
+          <td class="md" nowrap valign="top">gint <a class="el" href="struct__StpuiCurve.html#041da0cf21a17db4fedb8045c0eacdb3">_StpuiCurve::num_points</a>          </td>
         </tr>
       </table>
     </td>
@@ -341,13 +354,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="o6" args="" --><p>
+<a class="anchor" name="8580443f4197aa43eeb23b41f3984de3"></a><!-- doxytag: member="_StpuiCurve::pixmap" ref="8580443f4197aa43eeb23b41f3984de3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GdkPixmap* <a class="el" href="struct__StpuiCurve.html#o6">_StpuiCurve::pixmap</a>          </td>
+          <td class="md" nowrap valign="top">GdkPixmap* <a class="el" href="struct__StpuiCurve.html#8580443f4197aa43eeb23b41f3984de3">_StpuiCurve::pixmap</a>          </td>
         </tr>
       </table>
     </td>
@@ -364,13 +377,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="_StpuiCurve::point" ref="o12" args="" --><p>
+<a class="anchor" name="78ee54aa8f813885fe2fe20d232518b9"></a><!-- doxytag: member="_StpuiCurve::point" ref="78ee54aa8f813885fe2fe20d232518b9" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GdkPoint* <a class="el" href="struct__StpuiCurve.html#o12">_StpuiCurve::point</a>          </td>
+          <td class="md" nowrap valign="top">GdkPoint* <a class="el" href="struct__StpuiCurve.html#78ee54aa8f813885fe2fe20d232518b9">_StpuiCurve::point</a>          </td>
         </tr>
       </table>
     </td>
@@ -389,8 +402,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiCurveClass.html b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
index 53ea167..7f80bdc 100644
--- a/doc/gutenprintui2/html/struct__StpuiCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiCurveClass.html
@@ -2,35 +2,48 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: _StpuiCurveClass Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>_StpuiCurveClass Struct Reference</h1><!-- doxytag: class="_StpuiCurveClass" --><code>#include &lt;curve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingAreaClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o0">parent_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkDrawingAreaClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">parent_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o1">curve_type_changed</a> )(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#bd4d748a3214fe60405dd0f19071963c">curve_type_changed</a> )(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o2">_gtk_reserved1</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#858c3bfbf2316dff67461668960ea424">_gtk_reserved1</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o3">_gtk_reserved2</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_gtk_reserved2</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o4">_gtk_reserved3</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_gtk_reserved3</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#o5">_gtk_reserved4</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiCurveClass.html#43708b729750b48f02a0273f72cb8947">_gtk_reserved4</a> )(void)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="o2" args=")(void)" --><p>
+<a class="anchor" name="858c3bfbf2316dff67461668960ea424"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved1" ref="858c3bfbf2316dff67461668960ea424" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o2">_StpuiCurveClass::_gtk_reserved1</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#858c3bfbf2316dff67461668960ea424">_StpuiCurveClass::_gtk_reserved1</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -47,13 +60,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="o3" args=")(void)" --><p>
+<a class="anchor" name="b98e90cf60128ee094ed5cbec3f7b9bd"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved2" ref="b98e90cf60128ee094ed5cbec3f7b9bd" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o3">_StpuiCurveClass::_gtk_reserved2</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiCurveClass::_gtk_reserved2</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -70,13 +83,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="o4" args=")(void)" --><p>
+<a class="anchor" name="3a79f396911263c8c1c03ead4a6feecf"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved3" ref="3a79f396911263c8c1c03ead4a6feecf" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o4">_StpuiCurveClass::_gtk_reserved3</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_StpuiCurveClass::_gtk_reserved3</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -93,13 +106,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="o5" args=")(void)" --><p>
+<a class="anchor" name="43708b729750b48f02a0273f72cb8947"></a><!-- doxytag: member="_StpuiCurveClass::_gtk_reserved4" ref="43708b729750b48f02a0273f72cb8947" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#o5">_StpuiCurveClass::_gtk_reserved4</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiCurveClass.html#43708b729750b48f02a0273f72cb8947">_StpuiCurveClass::_gtk_reserved4</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -116,13 +129,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="o1" args=")(StpuiCurve *curve)" --><p>
+<a class="anchor" name="bd4d748a3214fe60405dd0f19071963c"></a><!-- doxytag: member="_StpuiCurveClass::curve_type_changed" ref="bd4d748a3214fe60405dd0f19071963c" args=")(StpuiCurve *curve)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(*  <a class="el" href="struct__StpuiCurveClass.html#o1">_StpuiCurveClass::curve_type_changed</a>)(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)          </td>
+          <td class="md" nowrap valign="top">void(*  <a class="el" href="struct__StpuiCurveClass.html#bd4d748a3214fe60405dd0f19071963c">_StpuiCurveClass::curve_type_changed</a>)(<a class="el" href="struct__StpuiCurve.html">StpuiCurve</a> *curve)          </td>
         </tr>
       </table>
     </td>
@@ -139,13 +152,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="o0" args="" --><p>
+<a class="anchor" name="30b4ac9159b3909d53a2913e9d33ce37"></a><!-- doxytag: member="_StpuiCurveClass::parent_class" ref="30b4ac9159b3909d53a2913e9d33ce37" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkDrawingAreaClass <a class="el" href="struct__StpuiCurveClass.html#o0">_StpuiCurveClass::parent_class</a>          </td>
+          <td class="md" nowrap valign="top">GtkDrawingAreaClass <a class="el" href="struct__StpuiCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">_StpuiCurveClass::parent_class</a>          </td>
         </tr>
       </table>
     </td>
@@ -164,8 +177,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="curve_8h.html">curve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
index 5f4d446..a0993f3 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurve.html
@@ -2,37 +2,50 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: _StpuiGammaCurve Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>_StpuiGammaCurve Struct Reference</h1><!-- doxytag: class="_StpuiGammaCurve" --><code>#include &lt;gammacurve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBox&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o0">vbox</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBox&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#fad9b4ea6fda50ab90f21ab8d4b6b70c">vbox</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o1">table</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#aab9e1de16f38176f86d7a92ba337a8d">table</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o2">curve</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#4efa264f5ef3e1a5c95736e07544ebf0">curve</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o3">button</a> [5]</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#f40e80ae3d6e7d34a12bf5c9d58c140b">button</a> [5]</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o4">gamma</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">gfloat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#05b048d7242cb7b8b57cfa3b1d65ecea">gamma</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o5">gamma_dialog</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#8dadefcd22adf55ea28403e900b2329e">gamma_dialog</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#o6">gamma_text</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkWidget *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurve.html#5b7be56d829006b2914afe741e75a31e">gamma_text</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="o3" args="[5]" --><p>
+<a class="anchor" name="f40e80ae3d6e7d34a12bf5c9d58c140b"></a><!-- doxytag: member="_StpuiGammaCurve::button" ref="f40e80ae3d6e7d34a12bf5c9d58c140b" args="[5]" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o3">_StpuiGammaCurve::button</a>[5]          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#f40e80ae3d6e7d34a12bf5c9d58c140b">_StpuiGammaCurve::button</a>[5]          </td>
         </tr>
       </table>
     </td>
@@ -49,13 +62,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="o2" args="" --><p>
+<a class="anchor" name="4efa264f5ef3e1a5c95736e07544ebf0"></a><!-- doxytag: member="_StpuiGammaCurve::curve" ref="4efa264f5ef3e1a5c95736e07544ebf0" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o2">_StpuiGammaCurve::curve</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#4efa264f5ef3e1a5c95736e07544ebf0">_StpuiGammaCurve::curve</a>          </td>
         </tr>
       </table>
     </td>
@@ -72,13 +85,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="o4" args="" --><p>
+<a class="anchor" name="05b048d7242cb7b8b57cfa3b1d65ecea"></a><!-- doxytag: member="_StpuiGammaCurve::gamma" ref="05b048d7242cb7b8b57cfa3b1d65ecea" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiGammaCurve.html#o4">_StpuiGammaCurve::gamma</a>          </td>
+          <td class="md" nowrap valign="top">gfloat <a class="el" href="struct__StpuiGammaCurve.html#05b048d7242cb7b8b57cfa3b1d65ecea">_StpuiGammaCurve::gamma</a>          </td>
         </tr>
       </table>
     </td>
@@ -95,13 +108,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="o5" args="" --><p>
+<a class="anchor" name="8dadefcd22adf55ea28403e900b2329e"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_dialog" ref="8dadefcd22adf55ea28403e900b2329e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o5">_StpuiGammaCurve::gamma_dialog</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#8dadefcd22adf55ea28403e900b2329e">_StpuiGammaCurve::gamma_dialog</a>          </td>
         </tr>
       </table>
     </td>
@@ -118,13 +131,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="o6" args="" --><p>
+<a class="anchor" name="5b7be56d829006b2914afe741e75a31e"></a><!-- doxytag: member="_StpuiGammaCurve::gamma_text" ref="5b7be56d829006b2914afe741e75a31e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o6">_StpuiGammaCurve::gamma_text</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#5b7be56d829006b2914afe741e75a31e">_StpuiGammaCurve::gamma_text</a>          </td>
         </tr>
       </table>
     </td>
@@ -141,13 +154,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="o1" args="" --><p>
+<a class="anchor" name="aab9e1de16f38176f86d7a92ba337a8d"></a><!-- doxytag: member="_StpuiGammaCurve::table" ref="aab9e1de16f38176f86d7a92ba337a8d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#o1">_StpuiGammaCurve::table</a>          </td>
+          <td class="md" nowrap valign="top">GtkWidget* <a class="el" href="struct__StpuiGammaCurve.html#aab9e1de16f38176f86d7a92ba337a8d">_StpuiGammaCurve::table</a>          </td>
         </tr>
       </table>
     </td>
@@ -164,13 +177,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="o0" args="" --><p>
+<a class="anchor" name="fad9b4ea6fda50ab90f21ab8d4b6b70c"></a><!-- doxytag: member="_StpuiGammaCurve::vbox" ref="fad9b4ea6fda50ab90f21ab8d4b6b70c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkVBox <a class="el" href="struct__StpuiGammaCurve.html#o0">_StpuiGammaCurve::vbox</a>          </td>
+          <td class="md" nowrap valign="top">GtkVBox <a class="el" href="struct__StpuiGammaCurve.html#fad9b4ea6fda50ab90f21ab8d4b6b70c">_StpuiGammaCurve::vbox</a>          </td>
         </tr>
       </table>
     </td>
@@ -189,8 +202,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
index 81d4836..a0e8165 100644
--- a/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
+++ b/doc/gutenprintui2/html/struct__StpuiGammaCurveClass.html
@@ -2,33 +2,46 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: _StpuiGammaCurveClass Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>_StpuiGammaCurveClass Struct Reference</h1><!-- doxytag: class="_StpuiGammaCurveClass" --><code>#include &lt;gammacurve.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBoxClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o0">parent_class</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GtkVBoxClass&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">parent_class</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o1">_gtk_reserved1</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#858c3bfbf2316dff67461668960ea424">_gtk_reserved1</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o2">_gtk_reserved2</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_gtk_reserved2</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o3">_gtk_reserved3</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_gtk_reserved3</a> )(void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#o4">_gtk_reserved4</a> )(void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="struct__StpuiGammaCurveClass.html#43708b729750b48f02a0273f72cb8947">_gtk_reserved4</a> )(void)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o1"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="o1" args=")(void)" --><p>
+<a class="anchor" name="858c3bfbf2316dff67461668960ea424"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved1" ref="858c3bfbf2316dff67461668960ea424" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o1">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#858c3bfbf2316dff67461668960ea424">_StpuiGammaCurveClass::_gtk_reserved1</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -45,13 +58,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="o2" args=")(void)" --><p>
+<a class="anchor" name="b98e90cf60128ee094ed5cbec3f7b9bd"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved2" ref="b98e90cf60128ee094ed5cbec3f7b9bd" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o2">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#b98e90cf60128ee094ed5cbec3f7b9bd">_StpuiGammaCurveClass::_gtk_reserved2</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -68,13 +81,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="o3" args=")(void)" --><p>
+<a class="anchor" name="3a79f396911263c8c1c03ead4a6feecf"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved3" ref="3a79f396911263c8c1c03ead4a6feecf" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o3">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#3a79f396911263c8c1c03ead4a6feecf">_StpuiGammaCurveClass::_gtk_reserved3</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -91,13 +104,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="o4" args=")(void)" --><p>
+<a class="anchor" name="43708b729750b48f02a0273f72cb8947"></a><!-- doxytag: member="_StpuiGammaCurveClass::_gtk_reserved4" ref="43708b729750b48f02a0273f72cb8947" args=")(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#o4">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="struct__StpuiGammaCurveClass.html#43708b729750b48f02a0273f72cb8947">_StpuiGammaCurveClass::_gtk_reserved4</a>)(void)          </td>
         </tr>
       </table>
     </td>
@@ -114,13 +127,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="o0" args="" --><p>
+<a class="anchor" name="30b4ac9159b3909d53a2913e9d33ce37"></a><!-- doxytag: member="_StpuiGammaCurveClass::parent_class" ref="30b4ac9159b3909d53a2913e9d33ce37" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">GtkVBoxClass <a class="el" href="struct__StpuiGammaCurveClass.html#o0">_StpuiGammaCurveClass::parent_class</a>          </td>
+          <td class="md" nowrap valign="top">GtkVBoxClass <a class="el" href="struct__StpuiGammaCurveClass.html#30b4ac9159b3909d53a2913e9d33ce37">_StpuiGammaCurveClass::parent_class</a>          </td>
         </tr>
       </table>
     </td>
@@ -139,8 +152,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gammacurve_8h.html">gammacurve.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__image.html b/doc/gutenprintui2/html/structstpui__image.html
index 37a158f..5c7378d 100644
--- a/doc/gutenprintui2/html/structstpui__image.html
+++ b/doc/gutenprintui2/html/structstpui__image.html
@@ -2,39 +2,52 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: stpui_image Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stpui_image Struct Reference</h1><!-- doxytag: class="stpui_image" --><code>#include &lt;gutenprintui.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o0">im</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_image_t&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#73bebce395b6f1efedcf6842fbdb4d76">im</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o1">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#2eab557840c9b342f902b27b6f4374c5">transpose</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o2">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#59c4e5062d0201345d9a3c517faed76b">hflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o3">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#5a79d8a51117f0f542de337737559e35">vflip</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o4">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#2dd5e7759fa1a528d7d609558f9a3af9">rotate_ccw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o5">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#2f391913505ad8be5f120fdc15083631">rotate_cw</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o6">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#38ffe38f14b789767f8a2f7823ad665f">rotate_180</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#o7">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">void(*&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__image.html#6746aa4c8378f9674566fbefb37a6aa7">crop</a> )(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)</td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stpui_image::crop" ref="o7" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" --><p>
+<a class="anchor" name="6746aa4c8378f9674566fbefb37a6aa7"></a><!-- doxytag: member="stpui_image::crop" ref="6746aa4c8378f9674566fbefb37a6aa7" args=")(struct stpui_image *image, int left, int top, int right, int bottom)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o7">stpui_image::crop</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#6746aa4c8378f9674566fbefb37a6aa7">stpui_image::crop</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image, int left, int top, int right, int bottom)          </td>
         </tr>
       </table>
     </td>
@@ -51,13 +64,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stpui_image::hflip" ref="o2" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="59c4e5062d0201345d9a3c517faed76b"></a><!-- doxytag: member="stpui_image::hflip" ref="59c4e5062d0201345d9a3c517faed76b" args=")(struct stpui_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o2">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#59c4e5062d0201345d9a3c517faed76b">stpui_image::hflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -74,13 +87,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stpui_image::im" ref="o0" args="" --><p>
+<a class="anchor" name="73bebce395b6f1efedcf6842fbdb4d76"></a><!-- doxytag: member="stpui_image::im" ref="73bebce395b6f1efedcf6842fbdb4d76" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">stp_image_t <a class="el" href="structstpui__image.html#o0">stpui_image::im</a>          </td>
+          <td class="md" nowrap valign="top">stp_image_t <a class="el" href="structstpui__image.html#73bebce395b6f1efedcf6842fbdb4d76">stpui_image::im</a>          </td>
         </tr>
       </table>
     </td>
@@ -97,13 +110,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stpui_image::rotate_180" ref="o6" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="38ffe38f14b789767f8a2f7823ad665f"></a><!-- doxytag: member="stpui_image::rotate_180" ref="38ffe38f14b789767f8a2f7823ad665f" args=")(struct stpui_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o6">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#38ffe38f14b789767f8a2f7823ad665f">stpui_image::rotate_180</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -120,13 +133,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="o4" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="2dd5e7759fa1a528d7d609558f9a3af9"></a><!-- doxytag: member="stpui_image::rotate_ccw" ref="2dd5e7759fa1a528d7d609558f9a3af9" args=")(struct stpui_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o4">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#2dd5e7759fa1a528d7d609558f9a3af9">stpui_image::rotate_ccw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -143,13 +156,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="o5" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="2f391913505ad8be5f120fdc15083631"></a><!-- doxytag: member="stpui_image::rotate_cw" ref="2f391913505ad8be5f120fdc15083631" args=")(struct stpui_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o5">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#2f391913505ad8be5f120fdc15083631">stpui_image::rotate_cw</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -166,13 +179,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stpui_image::transpose" ref="o1" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="2eab557840c9b342f902b27b6f4374c5"></a><!-- doxytag: member="stpui_image::transpose" ref="2eab557840c9b342f902b27b6f4374c5" args=")(struct stpui_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o1">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#2eab557840c9b342f902b27b6f4374c5">stpui_image::transpose</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -189,13 +202,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stpui_image::vflip" ref="o3" args=")(struct stpui_image *image)" --><p>
+<a class="anchor" name="5a79d8a51117f0f542de337737559e35"></a><!-- doxytag: member="stpui_image::vflip" ref="5a79d8a51117f0f542de337737559e35" args=")(struct stpui_image *image)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#o3">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
+          <td class="md" nowrap valign="top">void(* <a class="el" href="structstpui__image.html#5a79d8a51117f0f542de337737559e35">stpui_image::vflip</a>)(struct <a class="el" href="structstpui__image.html">stpui_image</a> *image)          </td>
         </tr>
       </table>
     </td>
@@ -214,8 +227,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/structstpui__plist__t.html b/doc/gutenprintui2/html/structstpui__plist__t.html
index e095ea6..7884679 100644
--- a/doc/gutenprintui2/html/structstpui__plist__t.html
+++ b/doc/gutenprintui2/html/structstpui__plist__t.html
@@ -2,49 +2,62 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: stpui_plist_t Struct Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li id="current"><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li><a href="classes.html"><span>Alphabetical&nbsp;List</span></a></li>
+    <li><a href="functions.html"><span>Data&nbsp;Fields</span></a></li>
+  </ul></div>
 <h1>stpui_plist_t Struct Reference</h1><!-- doxytag: class="stpui_plist_t" --><code>#include &lt;gutenprintui.h&gt;</code>
 <p>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o0">name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#b068931cc450442b63f5b3d276ea4297">name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o1">command_type</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#193b6cc04eadeb71b71417bf19c48c4c">command_type</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o2">queue_name</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#692e12dd54ad3badf18627bdb1784843">queue_name</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o3">extra_printer_options</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#41633c85d02d5b0157efadd6414fa77e">extra_printer_options</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o4">custom_command</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#4ea7b75bdeda81e50ea3cd316b341f41">custom_command</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o5">current_standard_command</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#d7d54f45247db317b37d0a4a1b4fc3d2">current_standard_command</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o6">output_filename</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">char *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#9c39e63596d53eb17161a43fce627940">output_filename</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">float&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o7">scaling</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">float&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#0ad29dfafe3dc8ad331b9397912e3d4d">scaling</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#a62">orient_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o8">orientation</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593">orient_t</a>&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#da1639422ad8f355d2371428471379b5">orientation</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o9">unit</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#3e34bdebd9bd5edda27e8728904a2552">unit</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o10">auto_size_roll_feed_paper</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#b679b17522d3fbb138dad90635cb91f7">auto_size_roll_feed_paper</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o11">invalid_mask</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">int&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#01f4a6c8919018e9df44948ed78a5f71">invalid_mask</a></td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_vars_t *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#o12">v</a></td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">stp_vars_t *&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="structstpui__plist__t.html#9e3669d19b675bd57058fd4664205d2a">v</a></td></tr>
 
 </table>
 <hr><h2>Field Documentation</h2>
-<a class="anchor" name="o10"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="o10" args="" --><p>
+<a class="anchor" name="b679b17522d3fbb138dad90635cb91f7"></a><!-- doxytag: member="stpui_plist_t::auto_size_roll_feed_paper" ref="b679b17522d3fbb138dad90635cb91f7" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o10">stpui_plist_t::auto_size_roll_feed_paper</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#b679b17522d3fbb138dad90635cb91f7">stpui_plist_t::auto_size_roll_feed_paper</a>          </td>
         </tr>
       </table>
     </td>
@@ -61,13 +74,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o1"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="o1" args="" --><p>
+<a class="anchor" name="193b6cc04eadeb71b71417bf19c48c4c"></a><!-- doxytag: member="stpui_plist_t::command_type" ref="193b6cc04eadeb71b71417bf19c48c4c" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a63">command_t</a> <a class="el" href="structstpui__plist__t.html#o1">stpui_plist_t::command_type</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#1d9b1ad69ddba33dc7f51bf85792777d">command_t</a> <a class="el" href="structstpui__plist__t.html#193b6cc04eadeb71b71417bf19c48c4c">stpui_plist_t::command_type</a>          </td>
         </tr>
       </table>
     </td>
@@ -84,13 +97,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o5"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="o5" args="" --><p>
+<a class="anchor" name="d7d54f45247db317b37d0a4a1b4fc3d2"></a><!-- doxytag: member="stpui_plist_t::current_standard_command" ref="d7d54f45247db317b37d0a4a1b4fc3d2" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o5">stpui_plist_t::current_standard_command</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#d7d54f45247db317b37d0a4a1b4fc3d2">stpui_plist_t::current_standard_command</a>          </td>
         </tr>
       </table>
     </td>
@@ -107,13 +120,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o4"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="o4" args="" --><p>
+<a class="anchor" name="4ea7b75bdeda81e50ea3cd316b341f41"></a><!-- doxytag: member="stpui_plist_t::custom_command" ref="4ea7b75bdeda81e50ea3cd316b341f41" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o4">stpui_plist_t::custom_command</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#4ea7b75bdeda81e50ea3cd316b341f41">stpui_plist_t::custom_command</a>          </td>
         </tr>
       </table>
     </td>
@@ -130,13 +143,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o3"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="o3" args="" --><p>
+<a class="anchor" name="41633c85d02d5b0157efadd6414fa77e"></a><!-- doxytag: member="stpui_plist_t::extra_printer_options" ref="41633c85d02d5b0157efadd6414fa77e" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o3">stpui_plist_t::extra_printer_options</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#41633c85d02d5b0157efadd6414fa77e">stpui_plist_t::extra_printer_options</a>          </td>
         </tr>
       </table>
     </td>
@@ -153,13 +166,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o11"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="o11" args="" --><p>
+<a class="anchor" name="01f4a6c8919018e9df44948ed78a5f71"></a><!-- doxytag: member="stpui_plist_t::invalid_mask" ref="01f4a6c8919018e9df44948ed78a5f71" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o11">stpui_plist_t::invalid_mask</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#01f4a6c8919018e9df44948ed78a5f71">stpui_plist_t::invalid_mask</a>          </td>
         </tr>
       </table>
     </td>
@@ -176,13 +189,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o0"></a><!-- doxytag: member="stpui_plist_t::name" ref="o0" args="" --><p>
+<a class="anchor" name="b068931cc450442b63f5b3d276ea4297"></a><!-- doxytag: member="stpui_plist_t::name" ref="b068931cc450442b63f5b3d276ea4297" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o0">stpui_plist_t::name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#b068931cc450442b63f5b3d276ea4297">stpui_plist_t::name</a>          </td>
         </tr>
       </table>
     </td>
@@ -199,13 +212,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o8"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="o8" args="" --><p>
+<a class="anchor" name="da1639422ad8f355d2371428471379b5"></a><!-- doxytag: member="stpui_plist_t::orientation" ref="da1639422ad8f355d2371428471379b5" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#a62">orient_t</a> <a class="el" href="structstpui__plist__t.html#o8">stpui_plist_t::orientation</a>          </td>
+          <td class="md" nowrap valign="top"><a class="el" href="gutenprintui_8h.html#b72dd018d9f09ee35f7ac40fc7f29593">orient_t</a> <a class="el" href="structstpui__plist__t.html#da1639422ad8f355d2371428471379b5">stpui_plist_t::orientation</a>          </td>
         </tr>
       </table>
     </td>
@@ -222,13 +235,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o6"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="o6" args="" --><p>
+<a class="anchor" name="9c39e63596d53eb17161a43fce627940"></a><!-- doxytag: member="stpui_plist_t::output_filename" ref="9c39e63596d53eb17161a43fce627940" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o6">stpui_plist_t::output_filename</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#9c39e63596d53eb17161a43fce627940">stpui_plist_t::output_filename</a>          </td>
         </tr>
       </table>
     </td>
@@ -245,13 +258,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o2"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="o2" args="" --><p>
+<a class="anchor" name="692e12dd54ad3badf18627bdb1784843"></a><!-- doxytag: member="stpui_plist_t::queue_name" ref="692e12dd54ad3badf18627bdb1784843" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#o2">stpui_plist_t::queue_name</a>          </td>
+          <td class="md" nowrap valign="top">char* <a class="el" href="structstpui__plist__t.html#692e12dd54ad3badf18627bdb1784843">stpui_plist_t::queue_name</a>          </td>
         </tr>
       </table>
     </td>
@@ -268,13 +281,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o7"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="o7" args="" --><p>
+<a class="anchor" name="0ad29dfafe3dc8ad331b9397912e3d4d"></a><!-- doxytag: member="stpui_plist_t::scaling" ref="0ad29dfafe3dc8ad331b9397912e3d4d" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">float <a class="el" href="structstpui__plist__t.html#o7">stpui_plist_t::scaling</a>          </td>
+          <td class="md" nowrap valign="top">float <a class="el" href="structstpui__plist__t.html#0ad29dfafe3dc8ad331b9397912e3d4d">stpui_plist_t::scaling</a>          </td>
         </tr>
       </table>
     </td>
@@ -291,13 +304,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o9"></a><!-- doxytag: member="stpui_plist_t::unit" ref="o9" args="" --><p>
+<a class="anchor" name="3e34bdebd9bd5edda27e8728904a2552"></a><!-- doxytag: member="stpui_plist_t::unit" ref="3e34bdebd9bd5edda27e8728904a2552" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#o9">stpui_plist_t::unit</a>          </td>
+          <td class="md" nowrap valign="top">int <a class="el" href="structstpui__plist__t.html#3e34bdebd9bd5edda27e8728904a2552">stpui_plist_t::unit</a>          </td>
         </tr>
       </table>
     </td>
@@ -314,13 +327,13 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="o12"></a><!-- doxytag: member="stpui_plist_t::v" ref="o12" args="" --><p>
+<a class="anchor" name="9e3669d19b675bd57058fd4664205d2a"></a><!-- doxytag: member="stpui_plist_t::v" ref="9e3669d19b675bd57058fd4664205d2a" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
       <table cellpadding="0" cellspacing="0" border="0">
         <tr>
-          <td class="md" nowrap valign="top">stp_vars_t* <a class="el" href="structstpui__plist__t.html#o12">stpui_plist_t::v</a>          </td>
+          <td class="md" nowrap valign="top">stp_vars_t* <a class="el" href="structstpui__plist__t.html#9e3669d19b675bd57058fd4664205d2a">stpui_plist_t::v</a>          </td>
         </tr>
       </table>
     </td>
@@ -339,8 +352,8 @@
 </table>
 <hr>The documentation for this struct was generated from the following file:<ul>
 <li>include/gutenprintui2/<a class="el" href="gutenprintui_8h.html">gutenprintui.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/gutenprintui2/html/tab_b.gif b/doc/gutenprintui2/html/tab_b.gif
new file mode 100644
index 0000000..0d62348
--- /dev/null
+++ b/doc/gutenprintui2/html/tab_b.gif
diff --git a/doc/gutenprintui2/html/tab_l.gif b/doc/gutenprintui2/html/tab_l.gif
new file mode 100644
index 0000000..9b1e633
--- /dev/null
+++ b/doc/gutenprintui2/html/tab_l.gif
diff --git a/doc/gutenprintui2/html/tab_r.gif b/doc/gutenprintui2/html/tab_r.gif
new file mode 100644
index 0000000..ce9dd9f
--- /dev/null
+++ b/doc/gutenprintui2/html/tab_r.gif
diff --git a/doc/gutenprintui2/html/tabs.css b/doc/gutenprintui2/html/tabs.css
new file mode 100644
index 0000000..a61552a
--- /dev/null
+++ b/doc/gutenprintui2/html/tabs.css
@@ -0,0 +1,102 @@
+/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
+
+DIV.tabs
+{
+   float            : left;
+   width            : 100%;
+   background       : url("tab_b.gif") repeat-x bottom;
+   margin-bottom    : 4px;
+}
+
+DIV.tabs UL
+{
+   margin           : 0px;
+   padding-left     : 10px;
+   list-style       : none;
+}
+
+DIV.tabs LI, DIV.tabs FORM
+{
+   display          : inline;
+   margin           : 0px;
+   padding          : 0px;
+}
+
+DIV.tabs FORM
+{
+   float            : right;
+}
+
+DIV.tabs A
+{
+   float            : left;
+   background       : url("tab_r.gif") no-repeat right top;
+   border-bottom    : 1px solid #84B0C7;
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+DIV.tabs A:hover
+{
+   background-position: 100% -150px;
+}
+
+DIV.tabs A:link, DIV.tabs A:visited,
+DIV.tabs A:active, DIV.tabs A:hover
+{
+       color: #1A419D;
+}
+
+DIV.tabs SPAN
+{
+   float            : left;
+   display          : block;
+   background       : url("tab_l.gif") no-repeat left top;
+   padding          : 5px 9px;
+   white-space      : nowrap;
+}
+
+DIV.tabs INPUT
+{
+   float            : right;
+   display          : inline;
+   font-size        : 1em;
+}
+
+DIV.tabs TD
+{
+   font-size        : x-small;
+   font-weight      : bold;
+   text-decoration  : none;
+}
+
+
+
+/* Commented Backslash Hack hides rule from IE5-Mac \*/
+DIV.tabs SPAN {float : none;}
+/* End IE5-Mac hack */
+
+DIV.tabs A:hover SPAN
+{
+   background-position: 0% -150px;
+}
+
+DIV.tabs LI#current A
+{
+   background-position: 100% -150px;
+   border-width     : 0px;
+}
+
+DIV.tabs LI#current SPAN
+{
+   background-position: 0% -150px;
+   padding-bottom   : 6px;
+}
+
+DIV.nav
+{
+   background       : none;
+   border           : none;
+   border-bottom    : 1px solid #84B0C7;
+}
diff --git a/doc/gutenprintui2/html/typebuiltins_8h.html b/doc/gutenprintui2/html/typebuiltins_8h.html
index ce0194a..f4d4a43 100644
--- a/doc/gutenprintui2/html/typebuiltins_8h.html
+++ b/doc/gutenprintui2/html/typebuiltins_8h.html
@@ -2,31 +2,43 @@
 <html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
 <title>libgutenprintui2 API Reference: include/gutenprintui2/typebuiltins.h File Reference</title>
 <link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.4.4 -->
-<div class="qindex"><a class="qindex" href="index.html">Main&nbsp;Page</a> | <a class="qindex" href="classes.html">Alphabetical&nbsp;List</a> | <a class="qindex" href="annotated.html">Data&nbsp;Structures</a> | <a class="qindex" href="dirs.html">Directories</a> | <a class="qindex" href="files.html">File&nbsp;List</a> | <a class="qindex" href="functions.html">Data&nbsp;Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<!-- Generated by Doxygen 1.4.5 -->
+<div class="tabs">
+  <ul>
+    <li><a href="index.html"><span>Main&nbsp;Page</span></a></li>
+    <li><a href="annotated.html"><span>Data&nbsp;Structures</span></a></li>
+    <li id="current"><a href="files.html"><span>Files</span></a></li>
+    <li><a href="dirs.html"><span>Directories</span></a></li>
+  </ul></div>
+<div class="tabs">
+  <ul>
+    <li><a href="files.html"><span>File&nbsp;List</span></a></li>
+    <li><a href="globals.html"><span>Globals</span></a></li>
+  </ul></div>
 <div class="nav">
-<a class="el" href="dir_000000.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir_000001.html">gutenprintui2</a></div>
+<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2F.html">include</a>&nbsp;&raquo&nbsp;<a class="el" href="dir__2Fhome_2Frleigh_2Fgutenprint_2Ddebian_2Ddist_2Finclude_2Fgutenprintui2_2F.html">gutenprintui2</a></div>
 <h1>typebuiltins.h File Reference</h1><code>#include &lt;glib-object.h&gt;</code><br>
 <table border="0" cellpadding="0" cellspacing="0">
 <tr><td></td></tr>
 <tr><td colspan="2"><br><h2>Defines</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a0">STPUI_TYPE_ORIENT_T</a>&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#b188f6f607a7c274ff9b93a7b9183c92">STPUI_TYPE_ORIENT_T</a>&nbsp;&nbsp;&nbsp;(orient_t_orient_t_get_type())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a1">STPUI_TYPE_COMMAND_T</a>&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#c556621db9092f28e345b98cb6db57e3">STPUI_TYPE_COMMAND_T</a>&nbsp;&nbsp;&nbsp;(command_t_command_t_get_type())</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a2">STPUI_TYPE_CURVE_TYPE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">#define&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#fd1aa89f9f88935e1482fa6675a28ee1">STPUI_TYPE_CURVE_TYPE</a>&nbsp;&nbsp;&nbsp;(stpui_curve_type_get_type())</td></tr>
 
 <tr><td colspan="2"><br><h2>Functions</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align="right" valign="top">G_BEGIN_DECLS GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a3">orient_t_orient_t_get_type</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">G_BEGIN_DECLS GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#2c321ec10322da403b1709b4a8956ee3">orient_t_orient_t_get_type</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a4">command_t_command_t_get_type</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#43d1612dab4df6c31f9b5362f88eaadf">command_t_command_t_get_type</a> (void)</td></tr>
 
-<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#a5">stpui_curve_type_get_type</a> (void)</td></tr>
+<tr><td class="memItemLeft" nowrap align="right" valign="top">GType&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="typebuiltins_8h.html#5e570d0225cd4f8ef426d648293dced9">stpui_curve_type_get_type</a> (void)</td></tr>
 
 </table>
 <hr><h2>Define Documentation</h2>
-<a class="anchor" name="a1"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="a1" args="" --><p>
+<a class="anchor" name="c556621db9092f28e345b98cb6db57e3"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_COMMAND_T" ref="c556621db9092f28e345b98cb6db57e3" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -49,7 +61,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a2"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="a2" args="" --><p>
+<a class="anchor" name="fd1aa89f9f88935e1482fa6675a28ee1"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_CURVE_TYPE" ref="fd1aa89f9f88935e1482fa6675a28ee1" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -72,7 +84,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a0"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="a0" args="" --><p>
+<a class="anchor" name="b188f6f607a7c274ff9b93a7b9183c92"></a><!-- doxytag: member="typebuiltins.h::STPUI_TYPE_ORIENT_T" ref="b188f6f607a7c274ff9b93a7b9183c92" args="" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -96,7 +108,7 @@
   </tr>
 </table>
 <hr><h2>Function Documentation</h2>
-<a class="anchor" name="a4"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="a4" args="(void)" --><p>
+<a class="anchor" name="43d1612dab4df6c31f9b5362f88eaadf"></a><!-- doxytag: member="typebuiltins.h::command_t_command_t_get_type" ref="43d1612dab4df6c31f9b5362f88eaadf" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -124,7 +136,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a3"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="a3" args="(void)" --><p>
+<a class="anchor" name="2c321ec10322da403b1709b4a8956ee3"></a><!-- doxytag: member="typebuiltins.h::orient_t_orient_t_get_type" ref="2c321ec10322da403b1709b4a8956ee3" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -152,7 +164,7 @@
     </td>
   </tr>
 </table>
-<a class="anchor" name="a5"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="a5" args="(void)" --><p>
+<a class="anchor" name="5e570d0225cd4f8ef426d648293dced9"></a><!-- doxytag: member="typebuiltins.h::stpui_curve_type_get_type" ref="5e570d0225cd4f8ef426d648293dced9" args="(void)" --><p>
 <table class="mdTable" cellpadding="2" cellspacing="0">
   <tr>
     <td class="mdRow">
@@ -180,8 +192,8 @@
     </td>
   </tr>
 </table>
-<hr size="1"><address style="align: right;"><small>Generated on Sat Aug 27 11:56:03 2005 for libgutenprintui2 API Reference by&nbsp;
+<hr size="1"><address style="align: right;"><small>Generated on Tue Nov 22 14:55:34 2005 for libgutenprintui2 API Reference by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.4 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.4.5 </small></address>
 </body>
 </html>
diff --git a/doc/users_guide/Makefile.am b/doc/users_guide/Makefile.am
deleted file mode 100644
index c29c952..0000000
--- a/doc/users_guide/Makefile.am
+++ /dev/null
@@ -1,547 +0,0 @@
-## $Id: Makefile.am,v 1.42 2005/01/30 16:01:52 rleigh Exp $
-## Copyright (C) 2001 Andy Stewart and Roger Leigh
-##
-## 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, 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.
-
-## Process this file with automake to produce Makefile.in.
-
-AUTOMAKE_OPTIONS = 1.4 gnu
-
-@SET_MAKE@
-
-MAINT_CHARSET = latin1
-
-include $(top_srcdir)/scripts/global.mk
-
-
-## Variables
-
-EPSLEVEL = 2
-
-UTIL_MANUAL = util-edition
-UTIL_MANUAL_SRC_FILES = $(srcdir)/$(UTIL_MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/utils.sgml \
-	$(srcdir)/gfdl.sgml
-
-GIMP_MANUAL = gimp-edition
-GIMP_MANUAL_SRC_FILES = $(srcdir)/$(GIMP_MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/gimp.sgml \
-	$(srcdir)/gfdl.sgml
-
-CUPS_MANUAL = cups-edition
-CUPS_MANUAL_SRC_FILES = $(srcdir)/$(CUPS_MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/cups.sgml \
-	$(srcdir)/gfdl.sgml
-
-MANUAL = users-guide
-MANUAL_SRC_FILES = $(srcdir)/$(MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/gimp.sgml \
-	$(srcdir)/cups.sgml \
-	$(srcdir)/utils.sgml \
-	$(srcdir)/gfdl.sgml
-
-UTIL_HTMLDIR = util_html
-GIMP_HTMLDIR = gimp_html
-CUPS_HTMLDIR = cups_html
-HTMLDIR = html
-
-UTIL_OUTPUTS = \
- $(UTIL_MANUAL).pdf \
- util_html
-
-GIMP_OUTPUTS = \
- $(GIMP_MANUAL).pdf \
- gimp_html
-
-CUPS_OUTPUTS = \
- $(CUPS_MANUAL).pdf \
- cups_html
-
-OUTPUTS = \
- $(MANUAL).pdf \
- html
-
-UTIL_GUIDE = $(UTIL_MANUAL).pdf util_html
-GIMP_GUIDE = $(GIMP_MANUAL).pdf gimp_html
-CUPS_GUIDE = $(CUPS_MANUAL).pdf cups_html
-USER_GUIDE = $(MANUAL).pdf html
-
-if INSTALL_USER_GUIDE
-STANDARD_TARGETS = $(USER_GUIDE)
-endif
-
-DISTHOOKDIRS = $(HTMLDIR)/stylesheet-images
-
-UTIL_PNG_IMAGES =
-
-CUPS_PNG_IMAGES = \
-	figures/cups_admin.png				\
-	figures/cups_admin_device.png			\
-	figures/cups_admin_make.png			\
-	figures/cups_admin_model.png			\
-	figures/cups_admin_success.png			\
-	figures/cups_config_printer.png			\
-	figures/cups_my_printer.png			\
-	figures/cups_printers.png			\
-	figures/cups_startup.png
-
-GIMP_PNG_IMAGES = \
-	figures/gimp-print-gui-1.png			\
-	figures/gimp-print-gui.png			\
-	figures/gimp-print-new-printer.png		\
-	figures/gimp-print-print-color-adjust.png	\
-	figures/gimp-print-setup.png			\
-	figures/gimp_image.png				\
-	figures/gimp_startup.png
-
-PNG_IMAGES = \
-	$(CUPS_PNG_IMAGES) 				\
-	$(GIMP_PNG_IMAGES)
-
-DISTHOOKFILES = $(PNG_IMAGES) $(STANDARD_TARGETS) $(HTMLDIR)/*.html $(HTMLDIR)/*.css
-
-UTIL_EPS_IMAGES = $(addsuffix .eps,$(basename $(UTIL_PNG_IMAGES)))
-GIMP_EPS_IMAGES = $(addsuffix .eps,$(basename $(GIMP_PNG_IMAGES)))
-CUPS_EPS_IMAGES = $(addsuffix .eps,$(basename $(CUPS_PNG_IMAGES)))
-EPS_IMAGES = $(addsuffix .eps,$(basename $(PNG_IMAGES)))
-
-if MAINTAINER_MODE
-MAINT_MODE = true
-else
-MAINT_MODE = false
-endif
-
-if MAINTAINER_MODE
-ALL_LOCAL_TARGETS = docs
-else
-ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
-endif
-
-## Rules
-
-dist-hook: $(USER_GUIDE)
-	for file in $(DISTHOOKFILES) ; do \
-	  if test -f $$file ; then \
-            if ! test -d $(distdir)/`dirname $$file` ; then \
-	      mkdir $(distdir)/`dirname $$file` ; \
-	    fi ; \
-	    cp -p $$file $(distdir)/`dirname $$file` ; \
-	  fi ; \
-	done
-	for dir in $(DISTHOOKDIRS) ; do \
-	  if test -d $(srcdir)/$$dir ; then \
-	    mkdir $(distdir)/$$dir; \
-	    for dirfile in $(srcdir)/$$dir/*; do \
-	      if test -f $$dirfile ; then \
-	        cp -p $$dirfile $(distdir)/$$dir ; \
-	      fi ; \
-	      if test -d $$dirfile ; then \
-	        cp -pR $$dirfile $(distdir)/$$dir ; \
-	      fi ; \
-	    done \
-	  fi \
-	done
-
-$(UTIL_MANUAL).pdf:  $(UTIL_MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	fi ; \
-	$(DB2PDF) $(UTIL_MANUAL).sgml
-
-$(GIMP_MANUAL).pdf:  $(GIMP_MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	  for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
-	    cp -p $$image figures/`basename $$image` ; \
-	  done ; \
-	fi ; \
-	$(DB2PDF) $(GIMP_MANUAL).sgml
-
-$(CUPS_MANUAL).pdf:  $(CUPS_MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	  for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
-	    cp -p $$image figures/`basename $$image` ; \
-	  done ; \
-	fi ; \
-	$(DB2PDF) $(CUPS_MANUAL).sgml
-
-$(MANUAL).pdf:  $(MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	  for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
-	    cp -p $$image figures/`basename $$image` ; \
-	  done ; \
-	fi ; \
-	$(DB2PDF) $(MANUAL).sgml
-
-editions:  docs cups_docs gimp_docs util_docs
-
-util_docs: util_html util_pdf
-gimp_docs: gimp_html gimp_pdf
-cups_docs: cups_html cups_pdf
-docs: html pdf
-
-all_util_docs: util_html util_ps util_pdf
-all_gimp_docs: gimp_html gimp_ps gimp_pdf
-all_cups_docs: cups_html cups_ps cups_pdf
-all_docs: html ps pdf
-
-all-local: $(ALL_LOCAL_TARGETS)
-
-util_pdf: $(UTIL_MANUAL).pdf
-gimp_pdf: $(GIMP_MANUAL).pdf
-cups_pdf: $(CUPS_MANUAL).pdf
-pdf: $(MANUAL).pdf
-
-util_ps: $(UTIL_MANUAL).ps
-gimp_ps: $(GIMP_MANUAL).ps
-cups_ps: $(CUPS_MANUAL).ps
-ps: $(MANUAL).ps
-
-$(UTIL_MANUAL).ps:  $(UTIL_MANUAL_SRC_FILES) $(UTIL_EPS_IMAGES)
-	for i in $(UTIL_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(UTIL_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(UTIL_MANUAL)-eps.sgml
-	$(DB2PS) $(UTIL_MANUAL)-eps.sgml
-	mv $(UTIL_MANUAL)-eps.ps $(UTIL_MANUAL).ps
-	for i in $(UTIL_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-$(GIMP_MANUAL).ps:  $(GIMP_MANUAL_SRC_FILES) $(GIMP_EPS_IMAGES)
-	for i in $(GIMP_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(GIMP_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(GIMP_MANUAL)-eps.sgml
-	$(DB2PS) $(GIMP_MANUAL)-eps.sgml
-	mv $(GIMP_MANUAL)-eps.ps $(GIMP_MANUAL).ps
-	for i in $(GIMP_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-$(CUPS_MANUAL).ps:  $(CUPS_MANUAL_SRC_FILES) $(CUPS_EPS_IMAGES)
-	for i in $(CUPS_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(CUPS_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(CUPS_MANUAL)-eps.sgml
-	$(DB2PS) $(CUPS_MANUAL)-eps.sgml
-	mv $(CUPS_MANUAL)-eps.ps $(CUPS_MANUAL).ps
-	for i in $(CUPS_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-$(MANUAL).ps:  $(MANUAL_SRC_FILES) $(EPS_IMAGES)
-	for i in $(MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(MANUAL)-eps.sgml
-	$(DB2PS) $(MANUAL)-eps.sgml
-	mv $(MANUAL)-eps.ps $(MANUAL).ps
-	for i in $(MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-%.eps:
-	if test ! -d figures ; then mkdir figures ; fi
-	$(CONVERT) $(srcdir)/$(basename $@).png EPS$(EPSLEVEL):$@
-
-util_html: util-html-stamp
-gimp_html: gimp-html-stamp
-cups_html: cups-html-stamp
-html: html-stamp
-
-# This ugly workaround with SOURCE is because db2html doesn't seem to like
-# "./users-guide.sgml".  Note that db2ps does not have the same limitation.
-# html-stamp should *only* be called by html--it's just a timestamp!
-
-util-html-stamp: $(UTIL_MANUAL_SRC_FILES) $(UTIL_PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(UTIL_MANUAL).sgml
-	-$(RM) -rf $(UTIL_HTMLDIR)
-	mv $(UTIL_MANUAL) $(UTIL_HTMLDIR)
-	chmod a+rx $(UTIL_HTMLDIR)
-	touch util-html-stamp
-
-gimp-html-stamp: $(GIMP_MANUAL_SRC_FILES) $(GIMP_PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(GIMP_MANUAL).sgml
-	-mkdir $(GIMP_MANUAL)/figures
-	for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
-	  cp -p $$image $(GIMP_MANUAL)/figures/`basename $$image` ; \
-	done
-	-$(RM) -rf $(GIMP_HTMLDIR)
-	mv $(GIMP_MANUAL) $(GIMP_HTMLDIR)
-	chmod a+rx $(GIMP_HTMLDIR)
-	touch gimp-html-stamp
-
-cups-html-stamp: $(CUPS_MANUAL_SRC_FILES) $(CUPS_PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(CUPS_MANUAL).sgml
-	-mkdir $(CUPS_MANUAL)/figures
-	for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
-	  cp -p $$image $(CUPS_MANUAL)/figures/`basename $$image` ; \
-	done
-	-$(RM) -rf $(CUPS_HTMLDIR)
-	mv $(CUPS_MANUAL) $(CUPS_HTMLDIR)
-	chmod a+rx $(CUPS_HTMLDIR)
-	touch cups-html-stamp
-
-html-stamp: $(MANUAL_SRC_FILES) $(PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(MANUAL).sgml
-	-mkdir $(MANUAL)/figures
-	for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
-	  cp -p $$image $(MANUAL)/figures/`basename $$image` ; \
-	done
-	-$(RM) -rf $(HTMLDIR)
-	mv $(MANUAL) $(HTMLDIR)
-	chmod a+rx $(HTMLDIR)
-	touch html-stamp
-
-install-data-local: $(STANDARD_TARGETS)
-	if test -n '$(STANDARD_TARGETS)' ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
-	  if test -f $(MANUAL).pdf ; then \
-	    $(INSTALL_DATA) $(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
-	  elif test -f $(srcdir)/$(MANUAL).pdf ; then \
-	    $(INSTALL_DATA) $(srcdir)/$(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
-	  fi ; \
-	  if test -d $(HTMLDIR) ; then \
-	  HTMLGENDIR="$(HTMLDIR)" ; \
-	  elif test -d $(srcdir)/$(HTMLDIR) ; then \
-	    HTMLGENDIR="$(srcdir)/$(HTMLDIR)" ; \
-	  else \
-	    exit 1 ; \
-	  fi ; \
-	  for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
-	    if test -f $$file ; then \
-	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html ; \
-	    fi ; \
-	  done ; \
-	  for file in $(srcdir)/figures/*.png ; do \
-	    if test -f $$file ; then \
-	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
-	    fi ; \
-	  done ; \
-	  if test -d $$HTMLGENDIR/stylesheet-images ; then \
-	    for file in $$HTMLGENDIR/stylesheet-images/* ; do \
-	      if test -f $$file ; then \
-	        $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
-	      fi ; \
-	    done ; \
-	  fi ; \
-	fi
-
-uninstall-local:
-	-$(RM) -r $(DESTDIR)$(datadir)/$(PACKAGE)/doc
-
-CLEAN_MANUALS = \
-	$(RM) -f $(MANUAL).pdf $(MANUAL).ps ;	\
-	$(RM) -f $(CUPS_MANUAL).pdf $(CUPS_MANUAL).ps ;	\
-	$(RM) -f $(GIMP_MANUAL).pdf $(GIMP_MANUAL).ps ;	\
-	$(RM) -f $(UTIL_MANUAL).pdf $(UTIL_MANUAL).ps ;	\
-	$(RM) -rf *html-stamp $(HTMLDIR) $(CUPS_HTMLDIR) $(GIMP_HTMLDIR) $(UTIL_HTMLDIR) ;	\
-	$(RM) -f $(EPS_IMAGES) $(CUPS_EPS_IMAGES) $(GIMP_EPS_IMAGES) $(UTIL_EPS_IMAGES)
-
-clean-local:
-	if test $(srcdir) = "." -a $(MAINT_MODE) = false ; then \
-	  echo "clean-local: Not removing $(HTMLDIR)" ; \
-	  echo 'clean-local: Not removing $(MANUAL).pdf' ; \
-	  echo 'clean-local: Not removing $(MANUAL).ps' ; \
-	  echo 'clean-local: Not removing EPS figures' ; \
-	else \
-	  $(CLEAN_MANUALS) ; \
-	fi
-	if test $(srcdir) = "." ; then \
-	  : ; \
-	else \
-	  $(RM) -f $(MANUAL_SRC_FILES) $(CUPS_MANUAL_SRC_FILES) ; \
-	  $(RM) -f $(GIMP_MANUAL_SRC_FILES) $(UTIL_CUPS_MANUAL_SRC_FILES) ; \
-	  $(RM) -rf figures ; \
-	fi
-	-$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
-	-$(RM) -rf db2html* DB2HTML*
-
-veryclean:
-	$(MAKE) MAINT_MODE=true clean
-
-maintainer-clean-local:
-	$(CLEAN_MANUALS)
-
-#
-# This is my (so far failed) attempt to create an index for this documentation.
-#
-#
-#index.sgml:
-#	$(PERL) /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -N -o index.sgml
-#
-#	$(JADE)	-V html-index \
-#		-t sgml \
-#		-c /usr/share/sgml/CATALOG.jade_dsl \
-#		-c /usr/share/sgml/CATALOG.docbook-dsssl-stylesheets \
-#		-c /usr/share/sgml/CATALOG.gnome \
-#		-c /usr/share/sgml/CATALOG.docbook_4 \
-#		-c /usr/share/sgml/CATALOG.docbook_3  \
-#		-D /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64 \
-#		-d /usr/share/sgml/docbook-toys/suse-both.dsl \
-#		-o index.sgml \
-#		gimp-print-users-guide-4.1.99-b3.sgml
-#
-#
-# END failed attempt at index creation.
-#
-
-help:
-	@echo "  "
-	@echo "Targets for the complete user's guide:"
-	@echo "  "
-	@echo "    docs      - creates PS, PDF, and HTML documentation files"
-	@echo "    all_docs  - creates PS and HTML documentation files"
-	@echo "    ps        - creates PostScript documentation"
-	@echo "    pdf       - creates PDF documentation"
-	@echo "    html      - creates HTML documentation"
-	@echo "    clean     - deletes machine generated files, but not outputs"
-	@echo "    veryclean - deletes output files in addition"
-	@echo "    help      - prints this help text"
-	@echo ""
-	@echo "Targets for specific manual editions:"
-	@echo "  "
-	@echo "    cups_html - generate HTML for CUPS edition of the manual"
-	@echo "    cups_pdf  - generate PDF for CUPS edition of the manual"
-	@echo "    cups_ps   - generate PS for CUPS edition of the manual"
-	@echo "  "
-	@echo "    gimp_docs - generate HTML, PDF, and PS for GIMP edition of the manual"
-	@echo "    gimp_html - generate HTML for GIMP edition of the manual"
-	@echo "    gimp_pdf  - generate PDF for GIMP edition of the manual"
-	@echo "    gimp_ps   - generate PS for GIMP edition of the manual"
-	@echo "  "
-	@echo "    util_docs - generate HTML, PDF, and PS for UTIL edition of the manual"
-	@echo "    util_html - generate HTML for UTIL edition of the manual"
-	@echo "    util_pdf  - generate PDF for UTIL edition of the manual"
-	@echo "    util_ps   - generate PS for UTIL edition of the manual"
-	@echo "  "
-	@echo "    editions  - generates HTML, PDF, and PS for ALL editions of the manual"
-	@echo "  "
-
-
-## Clean
-
-MAINTAINERCLEANFILES = Makefile.in *html-stamp
-
-
-EXTRA_DIST = README				\
-	$(MANUAL_SRC_FILES)			\
-	html-stamp				\
-	cups-edition.sgml			\
-	gimp-edition.sgml			\
-	util-edition.sgml
-
-.PHONY: docs cups_docs gimp_docs util_docs
-.PHONY: all_docs all_cups_docs all_gimp_docs all_util_docs
-.PHONY: html cups_html gimp_html util_html
-.PHONY: ps cups_ps gimp_ps util_ps
-.PHONY: pdf cups_pdf gimp_pdf util_pdf
-.PHONY: help
diff --git a/doc/users_guide/Makefile.in b/doc/users_guide/Makefile.in
deleted file mode 100644
index 10f8e83..0000000
--- a/doc/users_guide/Makefile.in
+++ /dev/null
@@ -1,986 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Variables
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/scripts/global.mk
-subdir = doc/users_guide
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/gimp.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/progtest.m4 \
-	$(top_srcdir)/m4/stp.m4 $(top_srcdir)/m4/stp_cups.m4 \
-	$(top_srcdir)/m4/stp_gimp.m4 $(top_srcdir)/m4/stp_option.m4 \
-	$(top_srcdir)/m4/stp_release.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUILD_CUPS_FALSE = @BUILD_CUPS_FALSE@
-BUILD_CUPS_PPDS_FALSE = @BUILD_CUPS_PPDS_FALSE@
-BUILD_CUPS_PPDS_TRUE = @BUILD_CUPS_PPDS_TRUE@
-BUILD_CUPS_TRUE = @BUILD_CUPS_TRUE@
-BUILD_ESCPUTIL_FALSE = @BUILD_ESCPUTIL_FALSE@
-BUILD_ESCPUTIL_TRUE = @BUILD_ESCPUTIL_TRUE@
-BUILD_FOOMATIC_3_FALSE = @BUILD_FOOMATIC_3_FALSE@
-BUILD_FOOMATIC_3_TRUE = @BUILD_FOOMATIC_3_TRUE@
-BUILD_FOOMATIC_FALSE = @BUILD_FOOMATIC_FALSE@
-BUILD_FOOMATIC_TRUE = @BUILD_FOOMATIC_TRUE@
-BUILD_GENPPD_STATIC_FALSE = @BUILD_GENPPD_STATIC_FALSE@
-BUILD_GENPPD_STATIC_TRUE = @BUILD_GENPPD_STATIC_TRUE@
-BUILD_GHOSTSCRIPT_FALSE = @BUILD_GHOSTSCRIPT_FALSE@
-BUILD_GHOSTSCRIPT_TRUE = @BUILD_GHOSTSCRIPT_TRUE@
-BUILD_GIMP2_FALSE = @BUILD_GIMP2_FALSE@
-BUILD_GIMP2_TRUE = @BUILD_GIMP2_TRUE@
-BUILD_GIMP_FALSE = @BUILD_GIMP_FALSE@
-BUILD_GIMP_TRUE = @BUILD_GIMP_TRUE@
-BUILD_LIBGUTENPRINTUI2_FALSE = @BUILD_LIBGUTENPRINTUI2_FALSE@
-BUILD_LIBGUTENPRINTUI2_TRUE = @BUILD_LIBGUTENPRINTUI2_TRUE@
-BUILD_LIBGUTENPRINTUI_FALSE = @BUILD_LIBGUTENPRINTUI_FALSE@
-BUILD_LIBGUTENPRINTUI_TRUE = @BUILD_LIBGUTENPRINTUI_TRUE@
-BUILD_MODULES_FALSE = @BUILD_MODULES_FALSE@
-BUILD_MODULES_TRUE = @BUILD_MODULES_TRUE@
-BUILD_TESTPATTERN_FALSE = @BUILD_TESTPATTERN_FALSE@
-BUILD_TESTPATTERN_TRUE = @BUILD_TESTPATTERN_TRUE@
-BUILD_TEST_FALSE = @BUILD_TEST_FALSE@
-BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
-BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
-BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONVERT = @CONVERT@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CUPS_CFLAGS = @CUPS_CFLAGS@
-CUPS_CONFIG = @CUPS_CONFIG@
-CUPS_LIBS = @CUPS_LIBS@
-CUPS_PPDS_AT_TOP_LEVEL_FALSE = @CUPS_PPDS_AT_TOP_LEVEL_FALSE@
-CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
-CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DB2HTML = @DB2HTML@
-DB2PDF = @DB2PDF@
-DB2PS = @DB2PS@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DIALOG = @DIALOG@
-DOXYGEN = @DOXYGEN@
-DVIPDF = @DVIPDF@
-DVIPS = @DVIPS@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FIND = @FIND@
-FOOMATIC_CONFIGURE = @FOOMATIC_CONFIGURE@
-FOOMATIC_KITLOAD = @FOOMATIC_KITLOAD@
-FOOMATIC_PPDFILE = @FOOMATIC_PPDFILE@
-GENPPD_LIBS = @GENPPD_LIBS@
-GIMP2_CFLAGS = @GIMP2_CFLAGS@
-GIMP2_LIBS = @GIMP2_LIBS@
-GIMPTOOL = @GIMPTOOL@
-GIMPTOOL2_CHECK = @GIMPTOOL2_CHECK@
-GIMPTOOL_CHECK = @GIMPTOOL_CHECK@
-GIMP_CFLAGS = @GIMP_CFLAGS@
-GIMP_CFLAGS_NOUI = @GIMP_CFLAGS_NOUI@
-GIMP_DATA_DIR = @GIMP_DATA_DIR@
-GIMP_LIBS = @GIMP_LIBS@
-GIMP_LIBS_NOUI = @GIMP_LIBS_NOUI@
-GIMP_PLUGIN_DIR = @GIMP_PLUGIN_DIR@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_CONFIG = @GLIB_CONFIG@
-GLIB_LIBS = @GLIB_LIBS@
-GLIB_MKENUMS = @GLIB_MKENUMS@
-GMSGFMT = @GMSGFMT@
-GNUCFLAGS = @GNUCFLAGS@
-GTK2_CFLAGS = @GTK2_CFLAGS@
-GTK2_LIBS = @GTK2_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_LIBS = @GTK_LIBS@
-GUTENPRINTUI2_BINARY_AGE = @GUTENPRINTUI2_BINARY_AGE@
-GUTENPRINTUI2_CFLAGS = @GUTENPRINTUI2_CFLAGS@
-GUTENPRINTUI2_CURRENT_INTERFACE = @GUTENPRINTUI2_CURRENT_INTERFACE@
-GUTENPRINTUI2_INTERFACE_AGE = @GUTENPRINTUI2_INTERFACE_AGE@
-GUTENPRINTUI2_LIBDEPS = @GUTENPRINTUI2_LIBDEPS@
-GUTENPRINTUI2_LIBS = $(top_builddir)/src/gutenprintui2/libgutenprintui2.la
-GUTENPRINTUI2_VERSION = @GUTENPRINTUI2_VERSION@
-GUTENPRINTUI_BINARY_AGE = @GUTENPRINTUI_BINARY_AGE@
-GUTENPRINTUI_CFLAGS = @GUTENPRINTUI_CFLAGS@
-GUTENPRINTUI_CURRENT_INTERFACE = @GUTENPRINTUI_CURRENT_INTERFACE@
-GUTENPRINTUI_INTERFACE_AGE = @GUTENPRINTUI_INTERFACE_AGE@
-GUTENPRINTUI_LIBDEPS = @GUTENPRINTUI_LIBDEPS@
-GUTENPRINTUI_LIBS = $(top_builddir)/src/gutenprintui/libgutenprintui.la
-GUTENPRINTUI_VERSION = @GUTENPRINTUI_VERSION@
-GUTENPRINT_BINARY_AGE = @GUTENPRINT_BINARY_AGE@
-GUTENPRINT_CFLAGS = @GUTENPRINT_CFLAGS@
-GUTENPRINT_CURRENT_INTERFACE = @GUTENPRINT_CURRENT_INTERFACE@
-GUTENPRINT_INTERFACE_AGE = @GUTENPRINT_INTERFACE_AGE@
-GUTENPRINT_LIBDEPS = @GUTENPRINT_LIBDEPS@
-
-# Libraries
-GUTENPRINT_LIBS = $(top_builddir)/src/main/libgutenprint.la
-GUTENPRINT_MAJOR_VERSION = @GUTENPRINT_MAJOR_VERSION@
-GUTENPRINT_MICRO_VERSION = @GUTENPRINT_MICRO_VERSION@
-GUTENPRINT_MINOR_VERSION = @GUTENPRINT_MINOR_VERSION@
-GUTENPRINT_VERSION = @GUTENPRINT_VERSION@
-IJS_CFLAGS = @IJS_CFLAGS@
-IJS_CONFIG = @IJS_CONFIG@
-IJS_LIBS = @IJS_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SAMPLES_FALSE = @INSTALL_SAMPLES_FALSE@
-INSTALL_SAMPLES_TRUE = @INSTALL_SAMPLES_TRUE@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTALL_USER_GUIDE_FALSE = @INSTALL_USER_GUIDE_FALSE@
-INSTALL_USER_GUIDE_TRUE = @INSTALL_USER_GUIDE_TRUE@
-INTLLIBS = @INTLLIBS@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBREADLINE_DEPS = @LIBREADLINE_DEPS@
-LIBS = $(INTLLIBS) @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBTOOL_DEPS = @LIBTOOL_DEPS@
-LN_S = @LN_S@
-LTALLOCA = @LTALLOCA@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_CFLAGS = @MAINTAINER_CFLAGS@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PERL = @PERL@
-PKG_CONFIG = @PKG_CONFIG@
-PLUG_IN_PATH = @PLUG_IN_PATH@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-RELEASE_DATE = @RELEASE_DATE@
-RM = @RM@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-TEXI2HTML = @TEXI2HTML@
-USE_LEVEL3_PS_FALSE = @USE_LEVEL3_PS_FALSE@
-USE_LEVEL3_PS_TRUE = @USE_LEVEL3_PS_TRUE@
-USE_NLS = @USE_NLS@
-USE_NLS_FALSE = @USE_NLS_FALSE@
-USE_NLS_TRUE = @USE_NLS_TRUE@
-VERSION = @VERSION@
-XGETTEXT = @XGETTEXT@
-YACC = @YACC@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-cups_bindir = @cups_bindir@
-cups_conf_datadir = @cups_conf_datadir@
-cups_conf_serverbin = @cups_conf_serverbin@
-cups_conf_serverroot = @cups_conf_serverroot@
-cups_exec_prefix = @cups_exec_prefix@
-cups_prefix = @cups_prefix@
-cups_sbindir = @cups_sbindir@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-gimp2_plug_indir = @gimp2_plug_indir@
-gimp_plug_indir = @gimp_plug_indir@
-gutenprint_cflags = @gutenprint_cflags@
-gutenprint_libs = @gutenprint_libs@
-gutenprintui2_cflags = @gutenprintui2_cflags@
-gutenprintui2_libs = @gutenprintui2_libs@
-gutenprintui_cflags = @gutenprintui_cflags@
-gutenprintui_libs = @gutenprintui_libs@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
-EPSLEVEL = 2
-UTIL_MANUAL = util-edition
-UTIL_MANUAL_SRC_FILES = $(srcdir)/$(UTIL_MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/utils.sgml \
-	$(srcdir)/gfdl.sgml
-
-GIMP_MANUAL = gimp-edition
-GIMP_MANUAL_SRC_FILES = $(srcdir)/$(GIMP_MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/gimp.sgml \
-	$(srcdir)/gfdl.sgml
-
-CUPS_MANUAL = cups-edition
-CUPS_MANUAL_SRC_FILES = $(srcdir)/$(CUPS_MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/cups.sgml \
-	$(srcdir)/gfdl.sgml
-
-MANUAL = users-guide
-MANUAL_SRC_FILES = $(srcdir)/$(MANUAL).sgml \
-	$(srcdir)/title.sgml \
-	$(srcdir)/history.sgml \
-	$(srcdir)/gimp.sgml \
-	$(srcdir)/cups.sgml \
-	$(srcdir)/utils.sgml \
-	$(srcdir)/gfdl.sgml
-
-UTIL_HTMLDIR = util_html
-GIMP_HTMLDIR = gimp_html
-CUPS_HTMLDIR = cups_html
-HTMLDIR = html
-UTIL_OUTPUTS = \
- $(UTIL_MANUAL).pdf \
- util_html
-
-GIMP_OUTPUTS = \
- $(GIMP_MANUAL).pdf \
- gimp_html
-
-CUPS_OUTPUTS = \
- $(CUPS_MANUAL).pdf \
- cups_html
-
-OUTPUTS = \
- $(MANUAL).pdf \
- html
-
-UTIL_GUIDE = $(UTIL_MANUAL).pdf util_html
-GIMP_GUIDE = $(GIMP_MANUAL).pdf gimp_html
-CUPS_GUIDE = $(CUPS_MANUAL).pdf cups_html
-USER_GUIDE = $(MANUAL).pdf html
-@INSTALL_USER_GUIDE_TRUE@STANDARD_TARGETS = $(USER_GUIDE)
-DISTHOOKDIRS = $(HTMLDIR)/stylesheet-images
-UTIL_PNG_IMAGES = 
-CUPS_PNG_IMAGES = \
-	figures/cups_admin.png				\
-	figures/cups_admin_device.png			\
-	figures/cups_admin_make.png			\
-	figures/cups_admin_model.png			\
-	figures/cups_admin_success.png			\
-	figures/cups_config_printer.png			\
-	figures/cups_my_printer.png			\
-	figures/cups_printers.png			\
-	figures/cups_startup.png
-
-GIMP_PNG_IMAGES = \
-	figures/gimp-print-gui-1.png			\
-	figures/gimp-print-gui.png			\
-	figures/gimp-print-new-printer.png		\
-	figures/gimp-print-print-color-adjust.png	\
-	figures/gimp-print-setup.png			\
-	figures/gimp_image.png				\
-	figures/gimp_startup.png
-
-PNG_IMAGES = \
-	$(CUPS_PNG_IMAGES) 				\
-	$(GIMP_PNG_IMAGES)
-
-DISTHOOKFILES = $(PNG_IMAGES) $(STANDARD_TARGETS) $(HTMLDIR)/*.html $(HTMLDIR)/*.css
-UTIL_EPS_IMAGES = $(addsuffix .eps,$(basename $(UTIL_PNG_IMAGES)))
-GIMP_EPS_IMAGES = $(addsuffix .eps,$(basename $(GIMP_PNG_IMAGES)))
-CUPS_EPS_IMAGES = $(addsuffix .eps,$(basename $(CUPS_PNG_IMAGES)))
-EPS_IMAGES = $(addsuffix .eps,$(basename $(PNG_IMAGES)))
-@MAINTAINER_MODE_FALSE@MAINT_MODE = false
-@MAINTAINER_MODE_TRUE@MAINT_MODE = true
-@MAINTAINER_MODE_FALSE@ALL_LOCAL_TARGETS = $(STANDARD_TARGETS)
-@MAINTAINER_MODE_TRUE@ALL_LOCAL_TARGETS = docs
-CLEAN_MANUALS = \
-	$(RM) -f $(MANUAL).pdf $(MANUAL).ps ;	\
-	$(RM) -f $(CUPS_MANUAL).pdf $(CUPS_MANUAL).ps ;	\
-	$(RM) -f $(GIMP_MANUAL).pdf $(GIMP_MANUAL).ps ;	\
-	$(RM) -f $(UTIL_MANUAL).pdf $(UTIL_MANUAL).ps ;	\
-	$(RM) -rf *html-stamp $(HTMLDIR) $(CUPS_HTMLDIR) $(GIMP_HTMLDIR) $(UTIL_HTMLDIR) ;	\
-	$(RM) -f $(EPS_IMAGES) $(CUPS_EPS_IMAGES) $(GIMP_EPS_IMAGES) $(UTIL_EPS_IMAGES)
-
-MAINTAINERCLEANFILES = Makefile.in *html-stamp
-EXTRA_DIST = README				\
-	$(MANUAL_SRC_FILES)			\
-	html-stamp				\
-	cups-edition.sgml			\
-	gimp-edition.sgml			\
-	util-edition.sgml
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/scripts/global.mk $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/users_guide/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  doc/users_guide/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../../scripts
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf-am:
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-local
-
-
-@SET_MAKE@
-
-export STP_MODULE_PATH = $(top_builddir)/src/main/.libs:$(top_builddir)/src/main
-export STP_DATA_PATH = $(top_srcdir)/src/main
-
-# Rules
-
-$(top_builddir)/src/main/libgutenprint.la:
-	cd $(top_builddir)/src/main; \
-	$(MAKE)
-
-$(top_builddir)/src/gutenprintui/libgutenprintui.la:
-	cd $(top_builddir)/src/gutenprintui; \
-	$(MAKE)
-
-$(top_builddir)/src/gutenprintui2/libgutenprintui2.la:
-	cd $(top_builddir)/src/gutenprintui2; \
-	$(MAKE)
-
-dist-hook: $(USER_GUIDE)
-	for file in $(DISTHOOKFILES) ; do \
-	  if test -f $$file ; then \
-            if ! test -d $(distdir)/`dirname $$file` ; then \
-	      mkdir $(distdir)/`dirname $$file` ; \
-	    fi ; \
-	    cp -p $$file $(distdir)/`dirname $$file` ; \
-	  fi ; \
-	done
-	for dir in $(DISTHOOKDIRS) ; do \
-	  if test -d $(srcdir)/$$dir ; then \
-	    mkdir $(distdir)/$$dir; \
-	    for dirfile in $(srcdir)/$$dir/*; do \
-	      if test -f $$dirfile ; then \
-	        cp -p $$dirfile $(distdir)/$$dir ; \
-	      fi ; \
-	      if test -d $$dirfile ; then \
-	        cp -pR $$dirfile $(distdir)/$$dir ; \
-	      fi ; \
-	    done \
-	  fi \
-	done
-
-$(UTIL_MANUAL).pdf:  $(UTIL_MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	fi ; \
-	$(DB2PDF) $(UTIL_MANUAL).sgml
-
-$(GIMP_MANUAL).pdf:  $(GIMP_MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	  for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
-	    cp -p $$image figures/`basename $$image` ; \
-	  done ; \
-	fi ; \
-	$(DB2PDF) $(GIMP_MANUAL).sgml
-
-$(CUPS_MANUAL).pdf:  $(CUPS_MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	  for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
-	    cp -p $$image figures/`basename $$image` ; \
-	  done ; \
-	fi ; \
-	$(DB2PDF) $(CUPS_MANUAL).sgml
-
-$(MANUAL).pdf:  $(MANUAL_SRC_FILES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
-	  if test -d figures ; then \
-	    : ; \
-	  else \
-	    mkdir figures ; \
-	  fi ; \
-	  for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
-	    cp -p $$image figures/`basename $$image` ; \
-	  done ; \
-	fi ; \
-	$(DB2PDF) $(MANUAL).sgml
-
-editions:  docs cups_docs gimp_docs util_docs
-
-util_docs: util_html util_pdf
-gimp_docs: gimp_html gimp_pdf
-cups_docs: cups_html cups_pdf
-docs: html pdf
-
-all_util_docs: util_html util_ps util_pdf
-all_gimp_docs: gimp_html gimp_ps gimp_pdf
-all_cups_docs: cups_html cups_ps cups_pdf
-all_docs: html ps pdf
-
-all-local: $(ALL_LOCAL_TARGETS)
-
-util_pdf: $(UTIL_MANUAL).pdf
-gimp_pdf: $(GIMP_MANUAL).pdf
-cups_pdf: $(CUPS_MANUAL).pdf
-pdf: $(MANUAL).pdf
-
-util_ps: $(UTIL_MANUAL).ps
-gimp_ps: $(GIMP_MANUAL).ps
-cups_ps: $(CUPS_MANUAL).ps
-ps: $(MANUAL).ps
-
-$(UTIL_MANUAL).ps:  $(UTIL_MANUAL_SRC_FILES) $(UTIL_EPS_IMAGES)
-	for i in $(UTIL_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(UTIL_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(UTIL_MANUAL)-eps.sgml
-	$(DB2PS) $(UTIL_MANUAL)-eps.sgml
-	mv $(UTIL_MANUAL)-eps.ps $(UTIL_MANUAL).ps
-	for i in $(UTIL_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-$(GIMP_MANUAL).ps:  $(GIMP_MANUAL_SRC_FILES) $(GIMP_EPS_IMAGES)
-	for i in $(GIMP_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(GIMP_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(GIMP_MANUAL)-eps.sgml
-	$(DB2PS) $(GIMP_MANUAL)-eps.sgml
-	mv $(GIMP_MANUAL)-eps.ps $(GIMP_MANUAL).ps
-	for i in $(GIMP_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-$(CUPS_MANUAL).ps:  $(CUPS_MANUAL_SRC_FILES) $(CUPS_EPS_IMAGES)
-	for i in $(CUPS_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(CUPS_MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(CUPS_MANUAL)-eps.sgml
-	$(DB2PS) $(CUPS_MANUAL)-eps.sgml
-	mv $(CUPS_MANUAL)-eps.ps $(CUPS_MANUAL).ps
-	for i in $(CUPS_MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-$(MANUAL).ps:  $(MANUAL_SRC_FILES) $(EPS_IMAGES)
-	for i in $(MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		sed -e 's/\.png"/.eps"/g' \
-		    -e 's/FORMAT="PNG"/FORMAT="EPS"/g' $$i > $$j-eps.sgml; \
-	done
-	cat $(MANUAL).sgml | sed -e 's/\.sgml"/-eps.sgml"/g' > $(MANUAL)-eps.sgml
-	$(DB2PS) $(MANUAL)-eps.sgml
-	mv $(MANUAL)-eps.ps $(MANUAL).ps
-	for i in $(MANUAL_SRC_FILES); do \
-		j=`basename $$i .sgml`; \
-		$(RM) -f $${j}-eps.*; \
-	done
-
-%.eps:
-	if test ! -d figures ; then mkdir figures ; fi
-	$(CONVERT) $(srcdir)/$(basename $@).png EPS$(EPSLEVEL):$@
-
-util_html: util-html-stamp
-gimp_html: gimp-html-stamp
-cups_html: cups-html-stamp
-html: html-stamp
-
-# This ugly workaround with SOURCE is because db2html doesn't seem to like
-# "./users-guide.sgml".  Note that db2ps does not have the same limitation.
-# html-stamp should *only* be called by html--it's just a timestamp!
-
-util-html-stamp: $(UTIL_MANUAL_SRC_FILES) $(UTIL_PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(UTIL_MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(UTIL_MANUAL).sgml
-	-$(RM) -rf $(UTIL_HTMLDIR)
-	mv $(UTIL_MANUAL) $(UTIL_HTMLDIR)
-	chmod a+rx $(UTIL_HTMLDIR)
-	touch util-html-stamp
-
-gimp-html-stamp: $(GIMP_MANUAL_SRC_FILES) $(GIMP_PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(GIMP_MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(GIMP_MANUAL).sgml
-	-mkdir $(GIMP_MANUAL)/figures
-	for image in $(addprefix $(srcdir)/, $(GIMP_PNG_IMAGES)) ; do \
-	  cp -p $$image $(GIMP_MANUAL)/figures/`basename $$image` ; \
-	done
-	-$(RM) -rf $(GIMP_HTMLDIR)
-	mv $(GIMP_MANUAL) $(GIMP_HTMLDIR)
-	chmod a+rx $(GIMP_HTMLDIR)
-	touch gimp-html-stamp
-
-cups-html-stamp: $(CUPS_MANUAL_SRC_FILES) $(CUPS_PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(CUPS_MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(CUPS_MANUAL).sgml
-	-mkdir $(CUPS_MANUAL)/figures
-	for image in $(addprefix $(srcdir)/, $(CUPS_PNG_IMAGES)) ; do \
-	  cp -p $$image $(CUPS_MANUAL)/figures/`basename $$image` ; \
-	done
-	-$(RM) -rf $(CUPS_HTMLDIR)
-	mv $(CUPS_MANUAL) $(CUPS_HTMLDIR)
-	chmod a+rx $(CUPS_HTMLDIR)
-	touch cups-html-stamp
-
-html-stamp: $(MANUAL_SRC_FILES) $(PNG_IMAGES)
-	if test $(srcdir) = '.' ; then \
-	  : ; \
-	else \
-	  if test -L $(notdir $<) ; then \
-	    $(RM) $(notdir $<) ; \
-	  fi ; \
-	  $(LN_S) -f $(MANUAL_SRC_FILES) . ; \
-	fi
-	$(DB2HTML) $(MANUAL).sgml
-	-mkdir $(MANUAL)/figures
-	for image in $(addprefix $(srcdir)/, $(PNG_IMAGES)) ; do \
-	  cp -p $$image $(MANUAL)/figures/`basename $$image` ; \
-	done
-	-$(RM) -rf $(HTMLDIR)
-	mv $(MANUAL) $(HTMLDIR)
-	chmod a+rx $(HTMLDIR)
-	touch html-stamp
-
-install-data-local: $(STANDARD_TARGETS)
-	if test -n '$(STANDARD_TARGETS)' ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
-	  $(mkinstalldirs) $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
-	  if test -f $(MANUAL).pdf ; then \
-	    $(INSTALL_DATA) $(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
-	  elif test -f $(srcdir)/$(MANUAL).pdf ; then \
-	    $(INSTALL_DATA) $(srcdir)/$(MANUAL).pdf $(DESTDIR)$(datadir)/$(PACKAGE)/doc ; \
-	  fi ; \
-	  if test -d $(HTMLDIR) ; then \
-	  HTMLGENDIR="$(HTMLDIR)" ; \
-	  elif test -d $(srcdir)/$(HTMLDIR) ; then \
-	    HTMLGENDIR="$(srcdir)/$(HTMLDIR)" ; \
-	  else \
-	    exit 1 ; \
-	  fi ; \
-	  for file in $$HTMLGENDIR/*.html $$HTMLGENDIR/*.css ; do \
-	    if test -f $$file ; then \
-	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html ; \
-	    fi ; \
-	  done ; \
-	  for file in $(srcdir)/figures/*.png ; do \
-	    if test -f $$file ; then \
-	      $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/figures ; \
-	    fi ; \
-	  done ; \
-	  if test -d $$HTMLGENDIR/stylesheet-images ; then \
-	    for file in $$HTMLGENDIR/stylesheet-images/* ; do \
-	      if test -f $$file ; then \
-	        $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/$(PACKAGE)/doc/html/stylesheet-images ; \
-	      fi ; \
-	    done ; \
-	  fi ; \
-	fi
-
-uninstall-local:
-	-$(RM) -r $(DESTDIR)$(datadir)/$(PACKAGE)/doc
-
-clean-local:
-	if test $(srcdir) = "." -a $(MAINT_MODE) = false ; then \
-	  echo "clean-local: Not removing $(HTMLDIR)" ; \
-	  echo 'clean-local: Not removing $(MANUAL).pdf' ; \
-	  echo 'clean-local: Not removing $(MANUAL).ps' ; \
-	  echo 'clean-local: Not removing EPS figures' ; \
-	else \
-	  $(CLEAN_MANUALS) ; \
-	fi
-	if test $(srcdir) = "." ; then \
-	  : ; \
-	else \
-	  $(RM) -f $(MANUAL_SRC_FILES) $(CUPS_MANUAL_SRC_FILES) ; \
-	  $(RM) -f $(GIMP_MANUAL_SRC_FILES) $(UTIL_CUPS_MANUAL_SRC_FILES) ; \
-	  $(RM) -rf figures ; \
-	fi
-	-$(RM) -rf *.tex *.log *.aux *.dvi *.gz *.out *.junk *.out *.fot
-	-$(RM) -rf db2html* DB2HTML*
-
-veryclean:
-	$(MAKE) MAINT_MODE=true clean
-
-maintainer-clean-local:
-	$(CLEAN_MANUALS)
-
-#
-# This is my (so far failed) attempt to create an index for this documentation.
-#
-#
-#index.sgml:
-#	$(PERL) /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64/bin/collateindex.pl -N -o index.sgml
-#
-#	$(JADE)	-V html-index \
-#		-t sgml \
-#		-c /usr/share/sgml/CATALOG.jade_dsl \
-#		-c /usr/share/sgml/CATALOG.docbook-dsssl-stylesheets \
-#		-c /usr/share/sgml/CATALOG.gnome \
-#		-c /usr/share/sgml/CATALOG.docbook_4 \
-#		-c /usr/share/sgml/CATALOG.docbook_3  \
-#		-D /usr/share/sgml/docbook/docbook-dsssl-stylesheets-1.64 \
-#		-d /usr/share/sgml/docbook-toys/suse-both.dsl \
-#		-o index.sgml \
-#		gimp-print-users-guide-4.1.99-b3.sgml
-#
-#
-# END failed attempt at index creation.
-#
-
-help:
-	@echo "  "
-	@echo "Targets for the complete user's guide:"
-	@echo "  "
-	@echo "    docs      - creates PS, PDF, and HTML documentation files"
-	@echo "    all_docs  - creates PS and HTML documentation files"
-	@echo "    ps        - creates PostScript documentation"
-	@echo "    pdf       - creates PDF documentation"
-	@echo "    html      - creates HTML documentation"
-	@echo "    clean     - deletes machine generated files, but not outputs"
-	@echo "    veryclean - deletes output files in addition"
-	@echo "    help      - prints this help text"
-	@echo ""
-	@echo "Targets for specific manual editions:"
-	@echo "  "
-	@echo "    cups_html - generate HTML for CUPS edition of the manual"
-	@echo "    cups_pdf  - generate PDF for CUPS edition of the manual"
-	@echo "    cups_ps   - generate PS for CUPS edition of the manual"
-	@echo "  "
-	@echo "    gimp_docs - generate HTML, PDF, and PS for GIMP edition of the manual"
-	@echo "    gimp_html - generate HTML for GIMP edition of the manual"
-	@echo "    gimp_pdf  - generate PDF for GIMP edition of the manual"
-	@echo "    gimp_ps   - generate PS for GIMP edition of the manual"
-	@echo "  "
-	@echo "    util_docs - generate HTML, PDF, and PS for UTIL edition of the manual"
-	@echo "    util_html - generate HTML for UTIL edition of the manual"
-	@echo "    util_pdf  - generate PDF for UTIL edition of the manual"
-	@echo "    util_ps   - generate PS for UTIL edition of the manual"
-	@echo "  "
-	@echo "    editions  - generates HTML, PDF, and PS for ALL editions of the manual"
-	@echo "  "
-
-.PHONY: docs cups_docs gimp_docs util_docs
-.PHONY: all_docs all_cups_docs all_gimp_docs all_util_docs
-.PHONY: html cups_html gimp_html util_html
-.PHONY: ps cups_ps gimp_ps util_ps
-.PHONY: pdf cups_pdf gimp_pdf util_pdf
-.PHONY: help
-# 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/doc/users_guide/README b/doc/users_guide/README
deleted file mode 100644
index c6f1025..0000000
--- a/doc/users_guide/README
+++ /dev/null
@@ -1,39 +0,0 @@
-
-The files contained in this directory are all of the source files necessary
-to build "The User's Guide to the Gutenprint Top Quality Printer Drivers".
-
-Type:  make pdf   - to build the PDF documentation file
-       make ps    - to build the Postscript documentation file
-       make html  - to build the HTML documentation files
-       make docs  - to build all of the documentation files
-
-This is what will be generated:
-
-	users_guide.ps
-	users_guide.pdf
-	html/book1.html
-
-While building the documentation, you will see messages from LaTeX regarding
-undefined references.  These can also be safely ignored.
-
-The documentation contains many color screenshots.  My goal was to have the
-documentation print acceptably at 360 DPI.  However, I realize that not everybody
-has a color printer.  For those people, such as the owners of laser printers,
-I'd like to suggest printing the documentation in greyscale.  Printing the
-documentation in black and white will results in unacceptable quality for many
-of the screenshots.
-
-All of the figures are contained in the "figures" subdirectory.  Read the
-figures/README file if you are interested in how I created the
-screenshots used throughout the documentation.
-
-All of the HTML files are contained in the "html" subdirectory.
-
-Your constructive feedback is most welcome.
-
-Andy Stewart
-13-oct-2001
-
-
-
-
diff --git a/doc/users_guide/cups-edition.sgml b/doc/users_guide/cups-edition.sgml
deleted file mode 100644
index 2056bbf..0000000
--- a/doc/users_guide/cups-edition.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title   SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp    SYSTEM "gimp.sgml">
-<!ENTITY cups    SYSTEM "cups.sgml">
-<!ENTITY utils   SYSTEM "utils.sgml">
-<!ENTITY gfdl    SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
-  <title>The User's Guide to the Gutenprint - CUPS Edition</title>
-  <date>April 7, 2002</date>
-  <pubdate>April 7, 2002</pubdate>
-  <author>
-    <firstname>Andy</firstname>
-    <surname>Stewart</surname>
-  </author>
-  <copyright>
-    <year>2002</year>
-    <holder>Andy Stewart</holder>
-  </copyright>
-  <legalnotice>
-    <para>The User's Guide to the Gutenprint - CUPS Edition, Copyright
-2002, Andy Stewart.
-    </para>
-
-&title;
-
-<chapter><title>CUPS Edition</title>
-
-  <caution><title>PLEASE NOTE</title>
-
-    <para>
-    This manual includes a subset of chapters from a more complete
-manual entitled <emphasis>The User's Guide to the Gutenprint Top
-Quality Printer Drivers</emphasis>.  To obtain the complete manual, go
-to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
-Project</ulink> home page.
-    </para>
-    <para>
-    This version of the manual has been specifically packaged in this
-way in an attempt to better suit the needs of people interested only
-in using the Gutenprint software with 
-<ulink url="http://www.cups.org">CUPS</ulink> (Common Unix Printing System).
-    </para>
-
-  </caution>
-
-</chapter>
-
-&history;
-&cups;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/cups.sgml b/doc/users_guide/cups.sgml
deleted file mode 100644
index c39506f..0000000
--- a/doc/users_guide/cups.sgml
+++ /dev/null
@@ -1,320 +0,0 @@
-
- <chapter><title>CUPS and Gutenprint</title>
-   <sect1><title>Introduction</title>
-     <para>
-       CUPS is an acronym which stands for <emphasis>C</emphasis>ommon
-<emphasis>U</emphasis>nix <emphasis>P</emphasis>rinting
-<emphasis>S</emphasis>ystem.  It is assumed that the reader has
-properly installed the CUPS software and the Gutenprint software.
-This section will discuss adding a printer to CUPS that uses a
-Gutenprint printer driver, as well as how to modify the various
-settings supplied by Gutenprint. This will be a rather quick
-explanation, as the CUPS software is quite well documented, and it is
-not my intention to attempt to duplicate the CUPS documentation here.
-     </para>
-   </sect1>
-
-   <sect1><title>CUPS Printer Installation</title>
-     <para>
-This explanation will use the web interface provided by CUPS. First,
-aim your favorite web browser at
-<ulink url="http://localhost:631">the CUPS server</ulink>.  The
-following screen should appear within your browser.
-    </para>
-
-   <figure><title>The CUPS Startup Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="45" fileref="figures/cups_startup.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Startup Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <para>
-Now, you may click on either the word <guilabel>Printers</guilabel> in the bar at the top
-of the page, or you may click on the <guilabel>Manage Printers</guilabel> text.  In
-either case, the next screen you see will look like this one if you
-have not yet configured any printers.
-   </para>
-
-   <figure><title>The CUPS Printers Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="45" fileref="figures/cups_printers.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Printers Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-    <para>
-At this time, click on the <guibutton>Add Printer</guibutton> button.
-You will then see the Admin screen (shown below).
-    </para>
-
-   <figure><title>The CUPS Admin Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="45" fileref="figures/cups_admin.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Admin Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <para>
-Notice in the screenshot that the three boxes are shown after the
-author filled them in for his printer at home.  You will need to fill
-in an appropriate name of your printer, its location, and a
-description which meets your own needs.  Once this is done, click on
-the <guibutton>Continue</guibutton> button, and then this screen will appear.
-   </para>
-
-   <figure id="fig-cups-admin-device"><title>The CUPS Admin Device Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="35" fileref="figures/cups_admin_device.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Admin Device Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <para>
-Click on the drop down menu next to the word
-<guilabel>Device</guilabel> and a list of possible printer devices
-appears.  Select the device appropriate for your printer.  Note that
-there are a range of serial, parallel, USB, and other devices from
-which to choose.  Once the selection is made, click the
-<guibutton>Continue</guibutton> button.  Now, this screen appears.
-   </para>
-
-   <figure><title>The CUPS Admin Model/Driver Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="35" fileref="figures/cups_admin_make.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Admin Model/Driver Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <caution>
-   <title>Caution Regarding USB Printers</title>
-
-   <para>
-CUPS versions 1.1.11 and later <emphasis>REQUIRE</emphasis>
-the user to insure that the desired USB printer is powered on
-<emphasis>AND</emphasis> physically connected to the USB bus
-<emphasis>BEFORE</emphasis> starting the CUPS software.  
-   </para>
-   <para>
-CUPS must see the USB printer when the software starts.  The CUPS software
-is typically started when the computer boots.  Note that one cannot
-simply plug in the USB printer and power it on after CUPS has started.
-(Note that this does not apply to parallel port printers).
-   </para>
-   <para>
-If the USB printer was not connected and powered on at the time CUPS was
-started, there will not be a USB printer shown in the
-list of devices on the CUPS Admin Device Window (see 
-<xref linkend="fig-cups-admin-device">).  In this event, stop the CUPS
-software, properly connect and power on the USB printer, and restart
-the CUPS software.
-   </para>
-   <para>
-From the list of devices shown in the CUPS Admin Device Window
-(see <xref linkend="fig-cups-admin-device">), a clever user might
-attempt to avoid this issue by selecting 
-<guimenuitem>Internet Printing Protocol</guimenuitem> 
-and then enter something similar to 'usb:/dev/usblp0' in the next
-screen.  However, this fails later in the configuration process with a
-"client_error_not_possible" error message with no other explanation.
-Note that entering 'file:/dev/usblp0' will not work either. While CUPS
-will allow this, printing will not actually work in some situations.
-   </para>
-   <para>
-CUPS versions 1.1.10 and earlier exhibit similar behavior with regard
-to not displaying the USB printer if it was not connected to the USB
-bus and powered up prior to starting the CUPS software.  However,
-these versions of CUPS will indeed allow the user to enter the name of
-the USB connection, unlike versions 1.1.11 and later.
-   </para>
-   </caution>
-
-   <para>
-Select the manufacturer of your printer and click the
-<guibutton>Continue</guibutton> button.  A window will appear which
-asks you to select the specific model number for your printer.
-   </para>
-
-   <para>
-Scroll through the long list and find the model number for your
-printer.  Notice carefully that there are many different languages
-supported for each printer, as denoted by the initials in parenthesis.
-(en) would be for English, (da) for Danish, (sv) for Swedish, (fr) for
-French, (no) for Norwegian, (pl) for Polish, and (en_GB) for British
-English (see <xref linkend="fig-cups-admin-model">).  Also take note
-of the Gutenprint revision for the driver, and ensure that it is
-indeed the version of Gutenprint which you have most recently
-installed.  Once you have made the proper selection, click on the
-<guibutton>Continue</guibutton> button. 
-   </para>
-
-   <figure id="fig-cups-admin-model"><title>The 2nd CUPS Admin Model/Driver Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="55" fileref="figures/cups_admin_model.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The 2nd CUPS Admin Model/Driver Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <figure><title>The CUPS Admin Success Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="39" fileref="figures/cups_admin_success.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Admin Success Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <para>
-Congratulations!  You should now see the CUPS window indicating that
-your printer was successfully installed.  Notice the sentence which
-reads "Printer your_printer has been added successfully".  Click on
-your_printer, which will be the underlined name for your printer.
-   </para>
-
-   <figure id="fig-cups-my-printer"><title>The CUPS Window for Your Printer</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="65" fileref="figures/cups_my_printer.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Window for Your Printer</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <para>
-After clicking on your_printer (epson_870 in this example), a window
-will appear similar to that shown in <xref linkend="fig-cups-my-printer">.
-It would probably be a good idea at this point to click on the
-<guibutton>Print Test Page</guibutton> button to ensure that
-everything is working properly.  Take note of the Gutenprint revision
-printed on this screen and confirm once again that it is the expected
-revision.
-   </para>
-
-   </sect1>
-
-   <sect1><title>Configuring your Printer in CUPS</title>
-
-     <para>
-With reference to <xref linkend="fig-cups-my-printer">, click
-on the <guibutton>Configure Printer</guibutton> button.  A partial
-screenshot of the printer configuration window appears in
-<xref linkend="fig-cups-printer-config-window">.
-The contents of this window will vary depending on precisely which
-printer you selected when you configured CUPS for your printer.  The
-screenshot shows the selections made by the author for his printer.
-The individual selections will not be explained in detail here, as
-they are the same selections which are available when using the
-Gutenprint plugin to the GIMP.  These selections are explained in
-detail in various sections of the <emphasis>GIMP and
-Gutenprint</emphasis> chapter of <emphasis>The User's Guide to the
-Gutenprint Top Quality Printer Drivers</emphasis>.
-   </para>
-
-   <figure id="fig-cups-printer-config-window"><title>The CUPS Printer Cofiguration Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="30" fileref="figures/cups_config_printer.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The CUPS Printer Configuration Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-
-   </sect1>
-
-   <sect1><title>Using CUPS from the Command Line</title>
-
-   <para>
-    It is possible to use the CUPS printing system from the command
-line.  While this document will not delve into all of the specifics of
-the CUPS command line interface, there are portions of this interface
-which are specific to the Gutenprint software.
-   </para>
-
-   <para>
-The command line is in some cases a more convenient way to generate
-printed output (e.g. when printing from a script).  However, most
-people (including the author) cannot easily predict what a command
-line option of "-o stpCyan=1350" will do to the output.  It is
-therefore a good idea to use the GIMP to view the image and the
-Gutenprint plugin to preview these settings before relying on the
-command line.
-   </para>
-
-   <para>
-When using CUPS from the command line, the command will have this
-general format:
-
-   <programlisting>
-   <![ CDATA [
-     lpr -P my_printer_name \
-         -o option1=<choice1> \
-         -o option2=<choice2> \
-         /path/to/printfile
-     ]]>
-   </programlisting>
-
-When typing the command directly onto the command line, put all of the
-command line options on one line, and do not type the "\" characters.
-The list of possible options which are specific to Gutenprint,
-followed by some of the supported choices, are shown below:
-
-   <programlisting>
-   <![ CDATA [
-   -o PageSize=<...| A3 | A4 | A4 | ...>
-   -o InputSlot=<Roll | Standard>
-   -o MediaType=< ..| Inkjet | Plain | GlossyPaper | ...>
-   -o Resolution=<360sw | 360swuni ...| 1440x720 >
-   -o ColorModel=<Black | RGB | Gray | CMYK>
-   -o stpBrightness=<0...2000>
-   -o stpContrast=<0...2000>
-   -o stpCyan=<0...4000>
-   -o stpDensity=<0...2000>
-   -o stpDither=<0...4000>
-   -o stpGamma=<0...4000>
-   -o stpImageType=<LineArt | Continuous | SolidTone>
-   -o stpInkType=<PhotoCMY | CMYK | PhotoCMYK | RGB>
-   -o stpMagenta=<0...4000>
-   -o stpSaturation=<0...9000>
-   -o stpYellow=<0...4000>
-   ]]>
-   </programlisting>
-
-For more detailed information, consult the appropriate sections of the <emphasis>GIMP and
-Gutenprint</emphasis> chapter of <emphasis>The User's Guide to the
-Gutenprint Top Quality Printer Drivers</emphasis>.
-   </para>
-
-   </sect1>
-
- </chapter>
diff --git a/doc/users_guide/figures/cups_admin.png b/doc/users_guide/figures/cups_admin.png
deleted file mode 100644
index 464fcc4..0000000
--- a/doc/users_guide/figures/cups_admin.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_admin_device.png b/doc/users_guide/figures/cups_admin_device.png
deleted file mode 100644
index b258263..0000000
--- a/doc/users_guide/figures/cups_admin_device.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_admin_make.png b/doc/users_guide/figures/cups_admin_make.png
deleted file mode 100644
index 1948ba7..0000000
--- a/doc/users_guide/figures/cups_admin_make.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_admin_model.png b/doc/users_guide/figures/cups_admin_model.png
deleted file mode 100644
index b476a75..0000000
--- a/doc/users_guide/figures/cups_admin_model.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_admin_success.png b/doc/users_guide/figures/cups_admin_success.png
deleted file mode 100644
index edebafe..0000000
--- a/doc/users_guide/figures/cups_admin_success.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_config_printer.png b/doc/users_guide/figures/cups_config_printer.png
deleted file mode 100644
index 1f980dc..0000000
--- a/doc/users_guide/figures/cups_config_printer.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_my_printer.png b/doc/users_guide/figures/cups_my_printer.png
deleted file mode 100644
index d8441c8..0000000
--- a/doc/users_guide/figures/cups_my_printer.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_printers.png b/doc/users_guide/figures/cups_printers.png
deleted file mode 100644
index 4d45d1c..0000000
--- a/doc/users_guide/figures/cups_printers.png
+++ /dev/null
diff --git a/doc/users_guide/figures/cups_startup.png b/doc/users_guide/figures/cups_startup.png
deleted file mode 100644
index 22d01d0..0000000
--- a/doc/users_guide/figures/cups_startup.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp-print-gui-1.png b/doc/users_guide/figures/gimp-print-gui-1.png
deleted file mode 100644
index 1c083bb..0000000
--- a/doc/users_guide/figures/gimp-print-gui-1.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp-print-gui.png b/doc/users_guide/figures/gimp-print-gui.png
deleted file mode 100644
index a9739fb..0000000
--- a/doc/users_guide/figures/gimp-print-gui.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp-print-new-printer.png b/doc/users_guide/figures/gimp-print-new-printer.png
deleted file mode 100644
index 39dd681..0000000
--- a/doc/users_guide/figures/gimp-print-new-printer.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp-print-print-color-adjust.png b/doc/users_guide/figures/gimp-print-print-color-adjust.png
deleted file mode 100644
index 5ab1a33..0000000
--- a/doc/users_guide/figures/gimp-print-print-color-adjust.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp-print-setup.png b/doc/users_guide/figures/gimp-print-setup.png
deleted file mode 100644
index e406c0b..0000000
--- a/doc/users_guide/figures/gimp-print-setup.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp_image.png b/doc/users_guide/figures/gimp_image.png
deleted file mode 100644
index 9193558..0000000
--- a/doc/users_guide/figures/gimp_image.png
+++ /dev/null
diff --git a/doc/users_guide/figures/gimp_startup.png b/doc/users_guide/figures/gimp_startup.png
deleted file mode 100644
index b6335e1..0000000
--- a/doc/users_guide/figures/gimp_startup.png
+++ /dev/null
diff --git a/doc/users_guide/gfdl.sgml b/doc/users_guide/gfdl.sgml
deleted file mode 100644
index 6db9fbe..0000000
--- a/doc/users_guide/gfdl.sgml
+++ /dev/null
@@ -1,466 +0,0 @@
-<appendix id="gfdl">
-<title>GNU Free Documentation License</title>
-<!-- - GNU Project - Free Software Foundation (FSF) -->
-<!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" -->
-
-
-  <!-- sect1>
-    <title>GNU Free Documentation License</title -->
-
-    <para>Version 1.1, March 2000</para>
-
-    <blockquote>
-      <para>Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.</para>
-    </blockquote>
-
-  <sect1 label="0">
-    <title>PREAMBLE</title>
-
-    <para>The purpose of this License is to make a manual, textbook,
-    or other written document "free" in the sense of freedom: to
-    assure everyone the effective freedom to copy and redistribute it,
-    with or without modifying it, either commercially or
-    noncommercially.  Secondarily, this License preserves for the
-    author and publisher a way to get credit for their work, while not
-    being considered responsible for modifications made by
-    others.</para>
-
-    <para>This License is a kind of "copyleft", which means that
-    derivative works of the document must themselves be free in the
-    same sense.  It complements the GNU General Public License, which
-    is a copyleft license designed for free software.</para>
-
-    <para>We have designed this License in order to use it for manuals
-    for free software, because free software needs free documentation:
-    a free program should come with manuals providing the same
-    freedoms that the software does.  But this License is not limited
-    to software manuals; it can be used for any textual work,
-    regardless of subject matter or whether it is published as a
-    printed book.  We recommend this License principally for works
-    whose purpose is instruction or reference.</para>
-  </sect1>
-
-  <sect1 label="1">
-    <title>APPLICABILITY AND DEFINITIONS</title>
-
-    <para>This License applies to any manual or other work that
-    contains a notice placed by the copyright holder saying it can be
-    distributed under the terms of this License.  The "Document",
-    below, refers to any such manual or work.  Any member of the
-    public is a licensee, and is addressed as "you".</para>
-
-    <para>A "Modified Version" of the Document means any work
-    containing the Document or a portion of it, either copied
-    verbatim, or with modifications and/or translated into another
-    language.</para>
-
-    <para>A "Secondary Section" is a named appendix or a front-matter
-    section of the Document that deals exclusively with the
-    relationship of the publishers or authors of the Document to the
-    Document's overall subject (or to related matters) and contains
-    nothing that could fall directly within that overall subject.
-    (For example, if the Document is in part a textbook of
-    mathematics, a Secondary Section may not explain any mathematics.)
-    The relationship could be a matter of historical connection with
-    the subject or with related matters, or of legal, commercial,
-    philosophical, ethical or political position regarding
-    them.</para>
-
-    <para>The "Invariant Sections" are certain Secondary Sections
-    whose titles are designated, as being those of Invariant Sections,
-    in the notice that says that the Document is released under this
-    License.</para>
-
-    <para>The "Cover Texts" are certain short passages of text that
-    are listed, as Front-Cover Texts or Back-Cover Texts, in the
-    notice that says that the Document is released under this
-    License.</para>
-
-    <para>A "Transparent" copy of the Document means a
-    machine-readable copy, represented in a format whose specification
-    is available to the general public, whose contents can be viewed
-    and edited directly and straightforwardly with generic text
-    editors or (for images composed of pixels) generic paint programs
-    or (for drawings) some widely available drawing editor, and that
-    is suitable for input to text formatters or for automatic
-    translation to a variety of formats suitable for input to text
-    formatters.  A copy made in an otherwise Transparent file format
-    whose markup has been designed to thwart or discourage subsequent
-    modification by readers is not Transparent.  A copy that is not
-    "Transparent" is called "Opaque".</para>
-
-    <para>Examples of suitable formats for Transparent copies include
-    plain ASCII without markup, Texinfo input format, LaTeX input
-    format, SGML or XML using a publicly available DTD, and
-    standard-conforming simple HTML designed for human modification.
-    Opaque formats include PostScript, PDF, proprietary formats that
-    can be read and edited only by proprietary word processors, SGML
-    or XML for which the DTD and/or processing tools are not generally
-    available, and the machine-generated HTML produced by some word
-    processors for output purposes only.</para>
-
-    <para>The "Title Page" means, for a printed book, the title page
-    itself, plus such following pages as are needed to hold, legibly,
-    the material this License requires to appear in the title page.
-    For works in formats which do not have any title page as such,
-    "Title Page" means the text near the most prominent appearance of
-    the work's title, preceding the beginning of the body of the
-    text.</para>
-  </sect1>
-
-  <sect1 label="2">
-    <title>VERBATIM COPYING</title>
-
-    <para>You may copy and distribute the Document in any medium,
-    either commercially or noncommercially, provided that this
-    License, the copyright notices, and the license notice saying this
-    License applies to the Document are reproduced in all copies, and
-    that you add no other conditions whatsoever to those of this
-    License.  You may not use technical measures to obstruct or
-    control the reading or further copying of the copies you make or
-    distribute.  However, you may accept compensation in exchange for
-    copies.  If you distribute a large enough number of copies you
-    must also follow the conditions in section 3.</para>
-
-    <para>You may also lend copies, under the same conditions stated
-    above, and you may publicly display copies.</para>
-  </sect1>
-
-  <sect1 label="3">
-    <title>COPYING IN QUANTITY</title>
-
-    <para>If you publish printed copies of the Document numbering more
-    than 100, and the Document's license notice requires Cover Texts,
-    you must enclose the copies in covers that carry, clearly and
-    legibly, all these Cover Texts: Front-Cover Texts on the front
-    cover, and Back-Cover Texts on the back cover.  Both covers must
-    also clearly and legibly identify you as the publisher of these
-    copies.  The front cover must present the full title with all
-    words of the title equally prominent and visible.  You may add
-    other material on the covers in addition.  Copying with changes
-    limited to the covers, as long as they preserve the title of the
-    Document and satisfy these conditions, can be treated as verbatim
-    copying in other respects.</para>
-
-    <para>If the required texts for either cover are too voluminous to
-    fit legibly, you should put the first ones listed (as many as fit
-    reasonably) on the actual cover, and continue the rest onto
-    adjacent pages.</para>
-
-    <para>If you publish or distribute Opaque copies of the Document
-    numbering more than 100, you must either include a
-    machine-readable Transparent copy along with each Opaque copy, or
-    state in or with each Opaque copy a publicly-accessible
-    computer-network location containing a complete Transparent copy
-    of the Document, free of added material, which the general
-    network-using public has access to download anonymously at no
-    charge using public-standard network protocols.  If you use the
-    latter option, you must take reasonably prudent steps, when you
-    begin distribution of Opaque copies in quantity, to ensure that
-    this Transparent copy will remain thus accessible at the stated
-    location until at least one year after the last time you
-    distribute an Opaque copy (directly or through your agents or
-    retailers) of that edition to the public.</para>
-
-    <para>It is requested, but not required, that you contact the
-    authors of the Document well before redistributing any large
-    number of copies, to give them a chance to provide you with an
-    updated version of the Document.</para>
-  </sect1>
-
-  <sect1 label="4">
-    <title>MODIFICATIONS</title>
-
-    <para>You may copy and distribute a Modified Version of the
-    Document under the conditions of sections 2 and 3 above, provided
-    that you release the Modified Version under precisely this
-    License, with the Modified Version filling the role of the
-    Document, thus licensing distribution and modification of the
-    Modified Version to whoever possesses a copy of it.  In addition,
-    you must do these things in the Modified Version:</para>
-
-    <orderedlist numeration="upperalpha">
-      <listitem><para>Use in the Title Page
-      (and on the covers, if any) a title distinct from that of the
-      Document, and from those of previous versions (which should, if
-      there were any, be listed in the History section of the
-      Document).  You may use the same title as a previous version if
-      the original publisher of that version gives permission.</para>
-      </listitem>
-
-      <listitem><para>List on the Title Page,
-      as authors, one or more persons or entities responsible for
-      authorship of the modifications in the Modified Version,
-      together with at least five of the principal authors of the
-      Document (all of its principal authors, if it has less than
-      five).</para>
-      </listitem>
-
-      <listitem><para>State on the Title page
-      the name of the publisher of the Modified Version, as the
-      publisher.</para>
-      </listitem>
-
-      <listitem><para>Preserve all the
-      copyright notices of the Document.</para>
-      </listitem>
-
-      <listitem><para>Add an appropriate
-      copyright notice for your modifications adjacent to the other
-      copyright notices.</para>
-      </listitem>
-
-      <listitem><para>Include, immediately
-      after the copyright notices, a license notice giving the public
-      permission to use the Modified Version under the terms of this
-      License, in the form shown in the Addendum below.</para>
-      </listitem>
-
-      <listitem><para>Preserve in that license
-      notice the full lists of Invariant Sections and required Cover
-      Texts given in the Document's license notice.</para>
-      </listitem>
-
-      <listitem><para>Include an unaltered
-      copy of this License.</para>
-      </listitem>
-
-      <listitem><para>Preserve the section
-      entitled "History", and its title, and add to it an item stating
-      at least the title, year, new authors, and publisher of the
-      Modified Version as given on the Title Page.  If there is no
-      section entitled "History" in the Document, create one stating
-      the title, year, authors, and publisher of the Document as given
-      on its Title Page, then add an item describing the Modified
-      Version as stated in the previous sentence.</para>
-      </listitem>
-
-      <listitem><para>Preserve the network
-      location, if any, given in the Document for public access to a
-      Transparent copy of the Document, and likewise the network
-      locations given in the Document for previous versions it was
-      based on.  These may be placed in the "History" section.  You
-      may omit a network location for a work that was published at
-      least four years before the Document itself, or if the original
-      publisher of the version it refers to gives permission.</para>
-      </listitem>
-
-      <listitem><para>In any section entitled
-      "Acknowledgements" or "Dedications", preserve the section's
-      title, and preserve in the section all the substance and tone of
-      each of the contributor acknowledgements and/or dedications
-      given therein.</para>
-      </listitem>
-
-      <listitem><para>Preserve all the
-      Invariant Sections of the Document, unaltered in their text and
-      in their titles.  Section numbers or the equivalent are not
-      considered part of the section titles.</para>
-      </listitem>
-
-      <listitem><para>Delete any section
-      entitled "Endorsements".  Such a section may not be included in
-      the Modified Version.</para>
-      </listitem>
-
-      <listitem><para>Do not retitle any
-      existing section as "Endorsements" or to conflict in title with
-      any Invariant Section.</para>
-      </listitem>
-    </orderedlist>
-
-    <para>If the Modified Version includes new front-matter sections
-    or appendices that qualify as Secondary Sections and contain no
-    material copied from the Document, you may at your option
-    designate some or all of these sections as invariant.  To do this,
-    add their titles to the list of Invariant Sections in the Modified
-    Version's license notice.  These titles must be distinct from any
-    other section titles.</para>
-
-    <para>You may add a section entitled "Endorsements", provided it
-    contains nothing but endorsements of your Modified Version by
-    various parties--for example, statements of peer review or that
-    the text has been approved by an organization as the authoritative
-    definition of a standard.</para>
-
-    <para>You may add a passage of up to five words as a Front-Cover
-    Text, and a passage of up to 25 words as a Back-Cover Text, to the
-    end of the list of Cover Texts in the Modified Version.  Only one
-    passage of Front-Cover Text and one of Back-Cover Text may be
-    added by (or through arrangements made by) any one entity.  If the
-    Document already includes a cover text for the same cover,
-    previously added by you or by arrangement made by the same entity
-    you are acting on behalf of, you may not add another; but you may
-    replace the old one, on explicit permission from the previous
-    publisher that added the old one.</para>
-
-    <para>The author(s) and publisher(s) of the Document do not by
-    this License give permission to use their names for publicity for
-    or to assert or imply endorsement of any Modified Version.</para>
-  </sect1>
-
-  <sect1 label="5">
-    <title>COMBINING DOCUMENTS</title>
-
-    <para>You may combine the Document with other documents released
-    under this License, under the terms defined in section 4 above for
-    modified versions, provided that you include in the combination
-    all of the Invariant Sections of all of the original documents,
-    unmodified, and list them all as Invariant Sections of your
-    combined work in its license notice.</para>
-
-    <para>The combined work need only contain one copy of this
-    License, and multiple identical Invariant Sections may be replaced
-    with a single copy.  If there are multiple Invariant Sections with
-    the same name but different contents, make the title of each such
-    section unique by adding at the end of it, in parentheses, the
-    name of the original author or publisher of that section if known,
-    or else a unique number.  Make the same adjustment to the section
-    titles in the list of Invariant Sections in the license notice of
-    the combined work.</para>
-
-    <para>In the combination, you must combine any sections entitled
-    "History" in the various original documents, forming one section
-    entitled "History"; likewise combine any sections entitled
-    "Acknowledgements", and any sections entitled "Dedications".  You
-    must delete all sections entitled "Endorsements."</para>
-  </sect1>
-
-  <sect1 label="6">
-    <title>COLLECTIONS OF DOCUMENTS</title>
-
-    <para>You may make a collection consisting of the Document and
-    other documents released under this License, and replace the
-    individual copies of this License in the various documents with a
-    single copy that is included in the collection, provided that you
-    follow the rules of this License for verbatim copying of each of
-    the documents in all other respects.</para>
-
-    <para>You may extract a single document from such a collection,
-    and distribute it individually under this License, provided you
-    insert a copy of this License into the extracted document, and
-    follow this License in all other respects regarding verbatim
-    copying of that document.</para>
-  </sect1>
-
-  <sect1 label="7">
-    <title>AGGREGATION WITH INDEPENDENT WORKS</title>
-
-    <para>A compilation of the Document or its derivatives with other
-    separate and independent documents or works, in or on a volume of
-    a storage or distribution medium, does not as a whole count as a
-    Modified Version of the Document, provided no compilation
-    copyright is claimed for the compilation.  Such a compilation is
-    called an "aggregate", and this License does not apply to the
-    other self-contained works thus compiled with the Document, on
-    account of their being thus compiled, if they are not themselves
-    derivative works of the Document.</para>
-
-    <para>If the Cover Text requirement of section 3 is applicable to
-    these copies of the Document, then if the Document is less than
-    one quarter of the entire aggregate, the Document's Cover Texts
-    may be placed on covers that surround only the Document within the
-    aggregate.  Otherwise they must appear on covers around the whole
-    aggregate.</para>
-  </sect1>
-
-  <sect1 label="8">
-    <title>TRANSLATION</title>
-
-    <para>Translation is considered a kind of modification, so you may
-    distribute translations of the Document under the terms of section
-    4.  Replacing Invariant Sections with translations requires
-    special permission from their copyright holders, but you may
-    include translations of some or all Invariant Sections in addition
-    to the original versions of these Invariant Sections.  You may
-    include a translation of this License provided that you also
-    include the original English version of this License.  In case of
-    a disagreement between the translation and the original English
-    version of this License, the original English version will
-    prevail.</para>
-  </sect1>
-
-  <sect1 label="9">
-    <title>TERMINATION</title>
-
-    <para>You may not copy, modify, sublicense, or distribute the
-    Document except as expressly provided for under this License.  Any
-    other attempt to copy, modify, sublicense or distribute the
-    Document is void, and will automatically terminate your rights
-    under this License.  However, parties who have received copies, or
-    rights, from you under this License will not have their licenses
-    terminated so long as such parties remain in full
-    compliance.</para>
-  </sect1>
-
-  <sect1 label="10">
-    <title>FUTURE REVISIONS OF THIS LICENSE</title>
-
-    <para>The Free Software Foundation may publish new, revised
-    versions of the GNU Free Documentation License from time to time.
-    Such new versions will be similar in spirit to the present
-    version, but may differ in detail to address new problems or
-    concerns.  See <ulink
-    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
-
-    <para>Each version of the License is given a distinguishing
-    version number.  If the Document specifies that a particular
-    numbered version of this License "or any later version" applies to
-    it, you have the option of following the terms and conditions
-    either of that specified version or of any later version that has
-    been published (not as a draft) by the Free Software Foundation.
-    If the Document does not specify a version number of this License,
-    you may choose any version ever published (not as a draft) by the
-    Free Software Foundation.</para>
-  </sect1>
-
-  <sect1 label="">
-    <title>How to use this License for your documents</title>
-
-    <para>To use this License in a document you have written, include
-    a copy of the License in the document and put the following
-    copyright and license notices just after the title page:</para>
-
-<blockquote><para>
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-</para></blockquote>
-
-    <para>If you have no Invariant Sections, write "with no Invariant
-    Sections" instead of saying which ones are invariant.  If you have
-    no Front-Cover Texts, write "no Front-Cover Texts" instead of
-    "Front-Cover Texts being LIST"; likewise for Back-Cover
-    Texts.</para>
-
-    <para>If your document contains nontrivial examples of program
-    code, we recommend releasing these examples in parallel under your
-    choice of free software license, such as the GNU General Public
-    License, to permit their use in free software.</para>
-  </sect1>
-
-</appendix>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:2
-sgml-parent-document: ("referenz.sgml" "appendix")
-sgml-exposed-tags:nil
-sgml-local-ecat-files:nil
-sgml-local-catalogs: CATALOG
-sgml-validate-command: "nsgmls -s referenz.sgml"
-ispell-skip-sgml: t
-End:
--->
diff --git a/doc/users_guide/gimp-edition.sgml b/doc/users_guide/gimp-edition.sgml
deleted file mode 100644
index 6834bbd..0000000
--- a/doc/users_guide/gimp-edition.sgml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title   SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp    SYSTEM "gimp.sgml">
-<!ENTITY cups    SYSTEM "cups.sgml">
-<!ENTITY utils   SYSTEM "utils.sgml">
-<!ENTITY gfdl    SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
-  <title>The User's Guide to the Gutenprint - GIMP Edition</title>
-  <date>April 7, 2002</date>
-  <pubdate>April 7, 2002</pubdate>
-  <author>
-    <firstname>Andy</firstname>
-    <surname>Stewart</surname>
-  </author>
-  <copyright>
-    <year>2002</year>
-    <holder>Andy Stewart</holder>
-  </copyright>
-  <legalnotice>
-    <para>The User's Guide to the Gutenprint - GIMP Edition, Copyright
-2002, Andy Stewart.
-    </para>
-
-&title;
-
-<chapter><title>GIMP Edition</title>
-
-  <caution><title>PLEASE NOTE</title>
-
-    <para>
-    This manual includes a subset of chapters from a more complete
-manual entitled <emphasis>The User's Guide to the Gutenprint Top
-Quality Printer Drivers</emphasis>.  To obtain the complete manual, go
-to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
-Project</ulink> home page.
-    </para>
-    <para>
-    This version of the manual has been specifically packaged in this
-way in an attempt to better suit the needs of people interested only
-in using the Gutenprint software with 
-<ulink url="http://www.gimp.org">GIMP</ulink> (GNU Image Manipulation Program).
-    </para>
-
-  </caution>
-
-</chapter>
-
-&history;
-&gimp;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/gimp.sgml b/doc/users_guide/gimp.sgml
deleted file mode 100644
index d8e5ae3..0000000
--- a/doc/users_guide/gimp.sgml
+++ /dev/null
@@ -1,886 +0,0 @@
-
- <chapter id="ch-gimp-and-gimp-print"><title>GIMP and Gutenprint</title>
-
-  <sect1>
-   <title>Running the GIMP</title>
-  <para>
-   This section assumes that you have the GIMP version 1.2 installed
-and working properly on your computer, and that you have an image of
-some type that you desire to print. To get started quickly, log into
-your system, start the X window system, and bring up your favorite terminal
-window.  At the $ prompt, type:
-
-  <programlisting>
-  <![ CDATA [
-     $ gimp &
-    ]]>
-  </programlisting>
-
-   This should start the GIMP for you. If it does not, check that
-you have installed the GIMP properly, and that its binary is located
-in one of the directories listed in your &dollar;PATH environment
-variable. On the assumption that this worked, the screen should now
-look something like this:
-
-   <figure><title>The Startup Window for The GIMP</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata fileref="figures/gimp_startup.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>Startup window for The GIMP</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   </para>
-   <para>
-   At this point, you should use the
-
-    <menuchoice>
-      <guimenu>File</guimenu>
-      <guimenuitem>Open</guimenuitem>
-    </menuchoice>
-
-menu option to open your favorite picture. We will print this picture
-shortly. Your picture should be displayed next to the GIMP startup
-window, perhaps looking similar to the following (sssh! Don't tell
-anybody the secret!):
-
-   <figure><title>A Sample Image Displayed by The GIMP</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="50" fileref="figures/gimp_image.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>A Sample Image displayed by The Gimp</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-  </para>
-
-  </sect1>
-
-  <sect1><title>The Gimp-Print Graphical User Interface</title>
-  <para>
-   Now that the GIMP is displaying your picture, put your mouse over
-the picture and click the right mouse button. A menu will appear.
-Choose the
-    <menuchoice>
-      <guimenu>File</guimenu>
-      <guimenuitem>Print</guimenuitem>
-    </menuchoice>
-menu option. This will cause the Gimp-Print GUI window to appear (see
-<xref linkend="fig-gimp-print-gui">). Move the mouse cursor
-over the various parts of the Gimp-Print GUI window, and notice that
-if you leave your mouse in one place for a short time without clicking
-any buttons, a small box appears.  This box contains helpful text.
-These small boxes are called "tooltips" and are intended to remind you
-about the function of each part of the graphical interface.
-    </para>
-    <para>
-The next several sections will continuously refer to
-<xref linkend="fig-gimp-print-gui"> and
-<xref linkend="fig-gimp-print-gui-1">.  The difference between
-the two figures can be seen in the top right corner of the window.
-Notice that there are two tabs, one which reads
-<guilabel>Printer Settings</guilabel> and another which reads
-<guilabel>Image/Output Settings</guilabel>.  Notice also that the
-window is divided into several major sections which directly map to
-the major sections of this document:
-  <itemizedlist>
-    <listitem>
-      <para><link linkend="sec-preview">Preview</link></para>
-    </listitem>
-    <listitem>
-      <para><link linkend="sec-printer-settings">Printer Settings</link></para>
-    </listitem>
-    <listitem>
-      <para><link linkend="sec-printer-settings">Image/Output Settings</link></para>
-    </listitem>
-    <listitem>
-      <para><link linkend="sec-position">Position</link></para>
-    </listitem>
-    <listitem>
-      <para><link linkend="sec-scaling">Size</link></para>
-    </listitem>
-    <listitem>
-      <para><link linkend="sec-printing-and-saving-settings">Printing and Saving Settings</link></para>
-    </listitem>
-  </itemizedlist>
-  </para>
-
-   <figure id="fig-gimp-print-gui"><title>The Gimp-Print Graphical User Interface 1 (GUI)</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="40" fileref="figures/gimp-print-gui.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The GIMP Print GUI showing printer settings</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-   <figure id="fig-gimp-print-gui-1"><title>The Gimp-Print Graphical User Interface 2 (GUI)</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="40" fileref="figures/gimp-print-gui-1.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The GIMP Print GUI showing image/output settings</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-  <sect2><title id="sec-printer-settings">Printer Settings</title>
-  <indexterm id="idx-printer-settings"><primary>Printer Settings</primary></indexterm>
-
-    <sect3><title>Printer</title>
-    <para>
-      Click on the <guilabel>Printer Settings</guilabel> tab near the
-top right hand corner of the window (see
-<xref linkend="fig-gimp-print-gui">).  Then, click on the downward
-facing arrow to the right of the <guilabel>Printer</guilabel> combo
-box to see a list of the system printer queues.  Select the queue to which
-you would like the printed image to be sent.  One may also print the
-image directly to a file by selecting <guimenuitem>File</guimenuitem>.
-In this event, the user will be prompted for the filename when either the
-<guibutton>Print</guibutton> button or the <guibutton>Print and Save
-Settings</guibutton> button is clicked.
-     </para>
-     <para>
-When either the <guibutton>Print and Save Settings</guibutton> button
-or the <guibutton>Save Settings</guibutton> button is clicked,
-the settings are saved in a file called
-<filename>~/.gimp-1.2/printrc</filename>.  The user is cautioned about
-hand editing this file since it is generated by Gutenprint (although
-it was the only way that the author found for removing bogus entries
-created while playing with the <guibutton>New Printer</guibutton> button).
-    </para>
-    </sect3>
-
-    <sect3><title>Setup Printer</title>
-    <para>
-     Before any useful printing can occur, the user needs to associate
-the named printer with the
-actual make and model of the printer.  Click the
-<guibutton>Setup Printer</guibutton> button in
-the <guilabel>Printer</guilabel> section of the window (the upper
-right, and just below the Printer display box). When this is done, the
-following window appears:
-
-   <figure><title>The Setup Printer Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="60" fileref="figures/gimp-print-setup.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The Setup Printer Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-    </para>
-
-    <para>
-     Scroll through the Printer Model section of the window until you
-find a printer which matches yours. If you cannot find the precise
-model, pick something close and hope for the best.  There are selections
-for a wide array of Postscript, inkjet, and laser printers.  After you
-have selected a printer, you will see the printer command displayed.
-    </para>
-    <para>
-The Gutenprint software does all of the necessary conversion of the
-image to be printed into the language of your printer. It is
-unnecessary and undesirable for any other sofware to manipulate this
-data.  (This is why the command contains the "-l" switch or the "-o
-raw" switch).  Please use care if you feel the need to edit this
-command.  Once you are satisfied with your selection, click the
-<guibutton>OK</guibutton> button.
-    </para>
-
-    </sect3>
-
-    <sect3><title>New Printer</title>
-
-    <para>
-     In the previous sections, the user selected an existing printer
-queue and associated a particular type of printer to that queue.  For
-most cases, this is probably all that is required.  However, some
-situations might require more detailed control over the handling of
-the printer data.
-     </para>
-     <para>
-     Click the <guibutton>New Printer</guibutton> button to tell the
-software that you wish to create a new name.  In this case, the new
-name may actually be an existing printer with different settings that
-you wish to save, or it may simply be a name associated with a
-particular command for handling the printer data.  A window will
-appear thus:
-
-   <figure><title>The New Printer Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata fileref="figures/gimp-print-new-printer.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>The New Printer Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-    Type a name into the window and click <guibutton>OK</guibutton>
-(or <guibutton>Cancel</guibutton> if you wish not to do this).
-Notice that the new name now appears as the selected <guilabel>Printer</guilabel>.
-As you change settings in the rest of the Gimp-Print GUI, they will be
-associated with this printer name.  When the settings are saved,
-they can be recovered easily by simply selecting this named printer
-from the Printer combo box.
-    </para>
-    <para>
-    One example where this feature might be used is as follows.  The
-author frequently prints photos on Epson 4x6 photo paper.  Note that
-this paper is physically larger than 4x6 and it has perforations on
-all four sides.  The author dislikes printing part of the image on the
-perforated parts of the paper which will be removed after
-printing the photo.  By selecting the proper scaling percentage,
-printing can be constrained to the 4x6 part of the paper which will
-remain after the perforated sections are removed.  The author has
-saved this setting using this feature of the Gutenprint software.
-    </para>
-
-    </sect3>
-
-   <sect3><title>Media Size</title>
-   <para>
-     The term <emphasis>media</emphasis> refers to paper, card stock,
-envelopes, or whatever you have put into your printer onto which
-something will be printed.  Click the arrow to the right of the
-<guilabel>Media Size</guilabel> box to see a long list of different
-sizes of media.  Choose the size that matches the media which you have
-loaded into your printer.  Once you have made your choice, the drop
-down menu will disappear, and your choice will be shown in the
-<guilabel>Media Size</guilabel> box.  The available paper sizes will
-vary depending upon the printer model you have selected.
-   </para>
-   <para>
-   Some printers support arbitrary (within limits!) paper sizes.
-   These printers will let you select <emphasis>Custom</emphasis>
-   or <emphasis>Roll</emphasis> paper sizes.  When you select such a
-   printer, one or both of the <guilabel>Dimensions</guilabel> boxes
-   will let you enter your paper size (in inches or centimetres).  The
-   boxes will not let you enter sizes that your printer cannot handle.
-   </para>
-   </sect3>
-
-   <sect3><title>Media Type</title>
-   <para>
-     The type of media onto which your image will be printed should be
-selected here.  Click on the arrow to the right of the <guilabel>Media
-Type</guilabel> box to see a long list of the different types of media
-onto which you may print your image.  Media types include such things
-as plain paper, postcards, photo quality paper, transparencies, and
-more!  Once you have made your choice, the drop down menu will
-disappear, and your choice will be shown in the <guilabel>Media
-Type</guilabel> box.  The choices available will vary depending upon
-the printer model you have selected.
-   </para>
-   </sect3>
-
-   <sect3><title>Media Source</title>
-   <para>
-     The <guilabel>Media Source</guilabel> box allows the user to
-  choose the paper source, sometimes called <emphasis>Input
-  Slot</emphasis>, that the paper will be fed from.  Many printers
-  only have one available input source (such as the standard paper
-  tray), in which case this entry will be grayed out.  If your printer
-  does support multiple input sources, you may specify the source of
-  your choice here.  Some Epson printers offer a roll feed option in
-  addition to the standard paper tray, and many HP LaserJet printers
-  have multiple paper trays.
-   </para>
-   </sect3>
-
-   <sect3><title>Ink Type</title>
-   <para>
-   Some printers offer a choice of different types of ink or ink
-   cartridges.  Many Canon and Lexmark printers support various
-   combinations of cartridges, such as black only, black and color,
-   photo color, and so forth.  Most Epson printers let you choose
-   between three and four color printing (three color uses only color
-   ink, while four color uses black ink as well).  Epson printers that
-   support six color photo printing allow you to choose five and six
-   color printing as well.
-   </para>
-   </sect3>
-
-   <sect3><title>Resolution</title>
-   <para>
-     Click on the arrow to the right of the
-<guilabel>Resolution</guilabel> box to see a long list of resolutions
-at which you can print your image.  The list is written with the
-lowest resolution at the top, with increasing resolution (and
-generally improved printing quality) as you approach the bottom of the
-list.  Different printers support different resolution options, and
-many printers support different quality choices using the same basic
-resolution.  In this menu are a few terms which may be unfamiliar to
-you, and they will now be explained.
-   </para>
-     <sect4><title>DPI</title>
-       <para>
-         DPI is an acronym which stands for <emphasis>D</emphasis>ots
-<emphasis>P</emphasis>er <emphasis>I</emphasis>nch.  This term refers
-to the number of dots that your printer will print in a space of one
-inch (approximately 2.54 cm).  This is highly dependent upon the
-capability of your printer.  Resolutions below 300 DPI are
-used for draft quality.  For general purpose printing, select
-300 - 360 DPI.  Higher quality printing can be achieved by
-selecting 600 - 720 DPI.  Settings higher than this are used for the
-highest possible quality for printing photographs and other high
-quality graphics.  Experiment with your printer and these settings
-with different types of graphics and photographs to see what
-results you can obtain with your printer.  High resolutions (large
-numbers of dots per inch) require substantial image processing time,
-and the print files can be very large; it's not uncommon for a full
-page, 1440x720 DPI image to require 100 MB of temporary storage!
-       </para>
-     </sect4>
-     <sect4><title>Draft or Fast Economy Draft</title>
-     <para>
-     When this text appears next to the resolution, it refers to the
-fact that the quality will be relatively low, but suitable for rough
-drafts.  Draft quality is higher than fast economy draft.  These
-options will give you the fastest printing speed.  Economy Draft uses
-less ink, and as a result the image will be pale.  These modes are
-generally not very useful for printing photographs.
-     </para>
-     </sect4>
-
-     <sect4><title>Unidirectional</title>
-       <para>
-         When printing an image, you have probably noticed the print
-head inside the printer moving back and forth across the print media.
-Many printers are capable of putting ink on the page regardless of
-which direction the print head is moving.  However, quality can
-sometimes be improved by only putting ink on the page when the printer
-head is moving in one direction.  The
-<guimenuitem>Unidirectional</guimenuitem> setting instructs the
-software to only place ink on the page when the print head is moving
-one way.  When the print head returns, it will not place ink on the
-page.  On many printers, the print quality is better, at the expense
-of printing speed.
-       </para>
-     </sect4>
-     <sect4><title>High(est) Quality</title>
-       <para>
-         With lower quality print modes, one may see an effect where
-the printed image looks like it has rows of stripes with a small
-separation between the stripes.  This effect is called "banding" and
-is undesirable.  In the <emphasis>high</emphasis> and
-<emphasis>highest</emphasis> quality modes, the printer will make more
-passes over the same part of the page in order to improve quality and
-(reduce or) eliminate banding.  This requires more temporary disk
-space and prints more slowly, but does not require significantly more
-processing time.
-       </para>
-     </sect4>
-     <sect4><title>DMT</title>
-       <para>
-       DMT is an acronym which stands for <emphasis>D</emphasis>ot
-       <emphasis>M</emphasis>odulation
-       <emphasis>T</emphasis>echnology.
-       This term refers to a print mode used by certain Canon printers
-       to improve the quality of the printed output.  Unfortunately,
-       at this time,  all of the available DMT modes do not work
-       correctly.  The cases which do work correctly will offer
-       significantly improved printing quality. 
-       </para>
-     </sect4>
-   </sect3>
-   </sect2>
-
-  <sect2><title id="sec-preview">Preview</title>
-  <para>
-   Notice in the upper left of the window is a preview of your image.
-This preview is a representation of where your picture will print on
-the selected media, and approximately what it will look like.  This
-preview will be updated as you modify selections in the
-<guilabel>Position</guilabel>, <guilabel>Size</guilabel>,
-<guilabel>Media Size</guilabel>, and <guilabel>Output Type</guilabel>
-portions of the window. You may also select the image with your mouse
-and move it manually if you wish. In doing so, you will note that the
-<guilabel>Position</guilabel> settings are updated accordingly.  Take
-note of the arrow, which points toward the top of the media, where top
-is the first part of the media to enter the printer.
-  </para>
-  <para>
-  The preview may be moved around the page as follows:
-  </para>
-  <itemizedlist>
-  <listitem><para> Clicking and dragging the <emphasis>left</emphasis>
-  (primary) mouse button moves the image around the page as you would
-  expect; the image moves with the mouse.  </para></listitem>
-  <listitem><para> Clicking and dragging the
-  <emphasis>middle</emphasis> mouse button moves the image around the
-  page in a finer fashion, such that each pixel of mouse movement
-  moves the image by one point (1/72 inch).  This allows very fine
-  placement of the image on the page.  </para></listitem>
-  <listitem><para> Clicking and dragging the
-  <emphasis>right</emphasis> (secondary) mouse button moves the image
-  around the page much the same as with the left button, but the image
-  will only move in units of the image size.  Thus, if the image is
-  one inch wide and two inches tall, the image will not move at all
-  until you have moved the mouse far enough so that the image would be
-  moved one inch vertically and two inches horizontally.  This is
-  handy if you wish to print multiple images of the same size on one
-  piece of paper.</para></listitem>
-  <listitem><para> If you hold down the <emphasis>shift</emphasis> key
-  on the keyboard when you click and drag the mouse, the image will
-  only move in the horizontal or vertical direction (depending upon
-  which way you first move the mouse).  This allows you to constrain
-  motion to the horizontal or vertical. </para></listitem>
-  <listitem><para> If you click another button while dragging the
-  mouse, the image will immediately return to the position it was in
-  before you clicked the mouse the first time.  This allows you to
-  not move the image if you have started moving it and have decided
-  that you don't want to move it.  The preview will not respond to the
-  mouse until you release all of the mouse buttons and click and drag
-  afresh. </para></listitem>
-  </itemizedlist>
-  </sect2>
-
-  <sect2><title id="sec-position">Position</title>
-
-   <sect3><title>Orientation</title>
-   <para>
-      The Orientation menu allows the user to choose the orientation
-of the paper.  The menu selections are
-<guimenuitem>Auto</guimenuitem>, <guimenuitem>Portrait</guimenuitem>,
-<guimenuitem>Landscape</guimenuitem>, <guimenuitem>Upside
-down</guimenuitem>, and <guimenuitem>Seascape</guimenuitem>.  Click on
-the rectangular tab to see these choices
-and make your selection.  When you have done so, the pulldown menu
-will have disappeared, and your choice will appear.  Also, note that
-the preview image will have changed accordingly.
-   </para>
-   <para>
-     When set to <guimenuitem>Auto</guimenuitem>, the software will make an
-intelligent choice of orientation based on the dimensions of the image
-to be printed.   <guimenuitem>Portrait</guimenuitem> orients the print media
-with the longest edge going from top to bottom, while
-<guimenuitem>Landscape</guimenuitem> orients the paper with the longest edge
-going from side to side.  <guimenuitem>Upside down</guimenuitem> and
-<guimenuitem>Seascape</guimenuitem> orient the paper the same as
-<guimenuitem>Portrait</guimenuitem> and  <guimenuitem>Landscape</guimenuitem>
-respectively, with the difference being that the image is rotated 180 degrees.
-   </para>
-   </sect3>
-
-   <sect3><title>Automatic Centering</title>
-   <para>
-      There are three buttons that deal with centering an image.  The
-leftmost button is the <guibutton>Vertically</guibutton> button, the
-middle button is the <guibutton>Both</guibutton> button, and
-the rightmost button is the <guibutton>Horizontally</guibutton>
-button.  Use the <guibutton>Both</guibutton> button to center your
-image both horizontally and vertically.  This will cause the top and
-bottom borders to be equal, and the left and right borders to be
-equal.  If you have placed your image manually by using the mouse
-button, then you may center the image in the horizontal direction only
-by clicking on the <guibutton>Horizontally</guibutton> button.
-Likewise, to adjust the image only in the vertical direction, click on
-the <guibutton>Vertically</guibutton> button.  Note that in
-each case, the image is centered with regard to the edges of the
-media, and without regard to the printable portion of the media.  Many
-printers are incapable of printing to each edge of the media.  Some
-media may have edges which detach.  Consult your printer documentation
-for more details regarding your printer's capabilities in this regard.
-   </para>
-   </sect3>
-
-   <sect3><title>Manual Settings</title>
-   <para>
-      You will notice that there are six boxes that contain numbers
-just below the Orientation menu and just above the GUI buttons related
-to centering an image.  When you move the preview image manually with
-the mouse, or when you click on one of the centering buttons, the
-preview image moves and these six boxes get updated.
-   </para>
-   <sect4><title>Left</title>
-   <para>
-     The number appearing in the <guimenuitem>Left</guimenuitem> box denotes
-the number of units (cm or inches) that the left side of the image
-will be printed away from the left edge of the media.  You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
-these GUI boxes.
-   </para>
-   </sect4>
-   <sect4><title>Right</title>
-   <para>
-     The number appearing in the <guimenuitem>Right</guimenuitem> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the left edge of the media.  You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
-these GUI boxes.
-   </para>
-   </sect4>
-   <sect4><title>Right Border</title>
-   <para>
-     The number appearing in the <guimenuitem>Right Border</guimenuitem> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the right edge of the media.  You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
-these GUI boxes.
-   </para>
-   </sect4>
-   <sect4><title>Top</title>
-   <para>
-     The number appearing in the <guimenuitem>Top</guimenuitem> box denotes
-the number of units (cm or inches) that the top side of the image
-will be printed away from the top edge of the media.  You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
-these GUI boxes.
-   </para>
-   </sect4>
-   <sect4><title>Bottom</title>
-   <para>
-     The number appearing in the <guimenuitem>Bottom</guimenuitem> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the top edge of the media.  You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
-these GUI boxes.
-   </para>
-   </sect4>
-
-   <sect4><title>Bottom Border</title>
-   <para>
-     The number appearing in the <guimenuitem>Bottom Border</guimenuitem> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the bottom edge of the media.  You may select
-the units by clicking the <guibutton>Inch</guibutton> or
-<guibutton>cm</guibutton> buttons in the  <guilabel>Units</guilabel> section just below
-these GUI boxes.
-   </para>
-   </sect4>
-
-   </sect3>
-
-  </sect2>
-
-  <sect2><title id="sec-scaling">Size</title>
-
-   <sect3><title>Slider Bar and Spin Box</title>
-   <para>
-      The slider bar can be moved as desired by the user.  Notice
-that while sliding this bar, the preview image changes accordingly.
-One will also note that several boxes in the Gimp-Print GUI change values when this bar is moved.
-These boxes are the six position boxes (left, right, right border,
-top, bottom, bottom border), the two size boxes (width and height),
-and the spin box to the right of the slider bar.
-   </para>
-   <para>
-   This slider bar is used to scale the image to a desirable size, but the same effect can
-be obtained by either clicking an arrow on the spin box to the right of this
-slider bar, or by manually typing a number into this spin box.  Notice
-that by setting the spin box in this way, the slider bar is also
-moved.  All of the described methods will cause the image to be
-scaled accordingly.
-   </para>
-   </sect3>
-
-   <sect3><title>Scale by Percent or PPI</title>
-   <para>
-       One may choose to scale the image by a percentage, or by PPI,
-which means "<emphasis>p</emphasis>ixels <emphasis>p</emphasis>er
-<emphasis>i</emphasis>nch".  Click the radio button
-next to the word to set the desired scaling factor.
-   </para>
-   <para>
-     When scaling by a percentage, the number reflected in the spin
-box next to the slider bar represents the percentage relative
-to the full size of the selected print medium.  For example, with this spin box
-set to 50, the image will be scaled to 50% of the size of the print
-medium.  When set to 100, the image will attempt to fill the print
-medium, within the constraints of maintaining the proper aspect ratio
-and the margins of the selected print medium.  This effect can be seen
-in the preview window.
-   </para>
-   <para>
-     When scaling by PPI, the number reflected in the spin box next to
-the slider bar represents the number of pixels that will be
-printed per inch.  For example, if the user is printing a 640x480
-image at a size of 6.4x4.8 inches (as measured by the size boxes), the
-image will be printed at 100 DPI.
-   </para>
-   </sect3>
-
-   <sect3><title>Use Original Image Size</title>
-     <para>
-       By clicking this button, the image will be scaled to as close
-to the native size of the image as possible.  This effect can
-immediately be seen in the preview image.
-     </para>
-     <para>
-     The native image size may be found or set in the GIMP by
-     selecting <guimenuitem>Image/Scale Image</guimenuitem> in the
-     GIMP.  Under the <guilabel>Print Size and Display Unit</guilabel>
-     group in the <guilabel>Scale Image</guilabel> dialog, you can
-     determine (or change) the width and height of the image, or
-     choose the resolution.
-     </para>
-   </sect3>
-
-   <sect3><title>Width and Height</title>
-     <para>
-       These boxes show the size of the printed image in either inches
-or centimeters (depending on which unit is selected).  The user may
-choose to manually modify these values.  When one value is modified,
-the other value is automatically modified in order to maintain the
-aspect ratio (the ratio of width to height).  This effect can be
-immediately seen in the preview image.
-     </para>
-   </sect3>
-
-   <sect3><title>Units</title>
-   <para>
-      The units can be set to inches or centimeters by clicking the appropriate
-radio button next to the desired unit.  This setting effects the
-values printed in the six position boxes (left, right, right border,
-top, bottom, bottom border) and the two size boxes (width and height).
-   </para>
-   </sect3>
-
-  </sect2>
-
-  <sect2><title id="sec-image-settings">Image/Output Settings</title>
-   <para>
-   By clicking on the tab labeled <guilabel>Image/Output
-Settings</guilabel>, the Gimp-Print window will appear as shown in
-<xref linkend="fig-gimp-print-gui-1">.  Notice that there are
-two sections to this portion of the window, namely,
-<guilabel>Image Type</guilabel> and
-<guilabel>Output Type</guilabel>.
-
-   </para>
-
-   <sect3><title>Image Type</title>
-
-    <sect4><title>Line Art</title>
-    <para>
-      This setting tells the printer driver to generate color
-quickly.  The color is bold and bright, but color accuracy is not very
-good.  There may also be some unexpectedly sharp transitions in
-colors.  This mode is acceptable for printing text with small amounts
-of color, and may be acceptable for presentation graphics.
-    </para>
-    </sect4>
-
-    <sect4><title>Solid Colors</title>
-    <para>
-      This mode produces color which is considerably more accurate
-than the <guilabel>Line Art</guilabel> mode, but with a reduction in performance.  In
-general, hues will be accurate but tonalities may not be accurate.
-There should be no sharp transitions in colors.  This mode is good for
-printing presentation graphics in most cases.
-    </para>
-    </sect4>
-
-    <sect4><title>Photograph</title>
-    <para>
-      This mode produces the most accurate colors and tonalities at a
-greater cost in performance.  This is the mode to use when printing
-high quality photographs or other high quality images.
-    </para>
-    </sect4>
-
-   </sect3>
-
-   <sect3><title>Output Type</title>
-    <para>
-      The user is given the choice of color, black and white, and
-grayscale.  Color is selected when the desired output is to be in
-color.  Greyscale will result in the printed image having various
-shades of grey.  Black and white is just that.  The effect of this
-setting can be seen in the preview window.
-    </para>
-   </sect3>
-
-   <sect3><title>Adjust Output</title>
-    <para>
-      Clicking on this button causes the <guilabel>Print Color Adjust</guilabel> window to
-appear (see <xref linkend="fig-gimp-print-color-adjust">).  In
-this window, one will see a representation of the image to be printed
-as well as several slider bars.  These slider bars collectively adjust
-many different aspects of the image.  The values can also be adjusted
-by clicking the arrows or by typing a value into the appropriate spin
-box on the right side of each slider bar.
-   </para>
-
-   <figure id="fig-gimp-print-color-adjust"><title>The Print Color Adjust Window</title>
-   <mediaobject>
-   <imageobject>
-   <imagedata scale="50" fileref="figures/gimp-print-print-color-adjust.png" FORMAT="PNG">
-   </imageobject>
-   <textobject>
-   <phrase>>The Print Color Adjust Window</phrase>
-   </textobject>
-   </mediaobject>
-   </figure>
-
-    <sect4><title>Brightness</title>
-    <para>
-    Adjust the brightness of the image.  A setting of 0.0 gives a fully black
-image, while a 2.0 setting gives a fully white image.  Values greater than 1.0 will result in
- black not being solid and highlights turning white; values less than
- 1.0 will result in white not being perfectly clear and shadows turning
- black.
-    </para>
-    </sect4>
-
-    <sect4><title>Contrast</title>
-    <para>
-    Adjust the contrast of the image.  A setting of 0.0 gives a solid gray for the
-entire image, the exact gray depending upon the brightness chosen.
-    </para>
-    </sect4>
-
-    <sect4><title>Cyan, Magenta, Yellow</title>
-    <para>
-These three options allow specification of the cyan, magenta, and
-yellow levels independently, for rebalancing the levels.  Normally,
-these should be adjusted to yield neutral gray, but they can be used
-for other effects.
-    </para>
-    </sect4>
-
-    <sect4><title>Saturation</title>
-    <para>
-Adjust the brilliance of colors.  A setting of 0.0 results in pure grayscale.
-A saturation setting of less than 1.0 results in more muted colors.  A
-saturation setting of greater than 1.0 results in more vibrant colors.  Very high
-saturation often results in very strange effects, including
-posterization and banding that might not be expected.  For normal
-purposes, the saturation should generally be set to a value less than 1.5.
-    </para>
-    </sect4>
-
-    <sect4><title>Density</title>
-    <para>
-Adjust the amount of ink deposited on the paper.  If you have chosen the
-correct paper type and are getting ink bleeding through the paper
-or puddling, try reducing the density to the lowest value you
-can while still achieving solid black.  If black is not solid
-black, even with the contrast and brightness at 1.0, try increasing
-the density.  Note that changes to this setting will not be visible in
-the image preview.
-    </para>
-    <para>
-All of the supported printers actually need less than 100% ink
-density in most cases, so the actual density is something other than
-the nominal density setting.  The effective density setting cannot go
-above 100%, so if a value specified will result in an excessively high
-density level, it will be silently limited to a setting of 1.0.
-    </para>
-    </sect4>
-
-    <sect4><title>Gamma</title>
-    <para>
-Adjust the gamma of the image, over and above the printer-specific
-correction.  Gamma less than 1.0 will result in a darker image; gamma
-greater than 1.0 will result in a lighter image.  Unlike brightness,
-gamma adjustment does not change the endpoints; it merely changes the
-shape of the input->output curve.
-    </para>
-    </sect4>
-
-    <sect4><title>Dither Algorithm</title>
-    <para>
-The recommended dither algorithm is <guimenuitem>Adaptive
-Hybrid</guimenuitem> (which is the default) for text or other fine
-black detail, or if this is mixed with continuous tone images.  The
-<guimenuitem>Ordered</guimenuitem> dithering algorithm is just as good
-(and somewhat faster) for pure continuous-tone images and photographs,
-but may yield poor results with text or other fine detail,
-particularly at high printing resolutions.
-    </para>
-    <para> The <guimenuitem>Fast</guimenuitem> algorithm gives the
-fastest results at the expense of color accuracy.  It is a simplified
-ordered dither.  On simple four color printers (or other printers used
-in four color mode), the quality is similar to
-<guimenuitem>Ordered</guimenuitem>, although dark gray rendition is
-not as good due to a simpler transfer between black and colored ink.
-With six-color printers, color rendition is somewhat worse, but it
-should be quite usable in cases where optimum quality is not critical.
-In black and white, it is an efficient way to render grayscale, but it
-may not give best results when used with variable dot size printers
-(modern Epson printers, or Canon printers using DMT).  On rare three
-color printers (CMY only) the results should be identical to ordered
-dither.
-    </para>
-    <para> <guimenuitem>Very Fast</guimenuitem> is even faster than
-<guimenuitem>Fast</guimenuitem>, with even more loss of quality.
-Color and grayscale output will show strong patterning that resembles
-screening, although it isn't.  On laser printers, and possibly on
-certain kinds of text and line art, <guimenuitem>Very
-Fast</guimenuitem> dithering may actually yield the best quality.
-    </para>
-    <para>
-Error diffusion algorithms (<guimenuitem>Hybrid
-Floyd-Steinberg</guimenuitem> is such an algorithm) perform very well
-at high densities, and are capable of
-rendering very fine detail rather well, but they tend to exhibit artifacts in
-the form of "waves" or "worms" of dots which results in noticeable
-texturing in pale areas.  Furthermore, pale areas immediately adjacent
-to white take a while to "build up" sufficient error to print at all.
-This is sometimes called "tearing" or "waterfalling".
-    </para>
-
-    </sect4>
-
-    <sect4><title>Set Defaults and Close</title>
-    <para>
-      When the <guibutton>Set Defaults</guibutton> button is clicked,
-the slider bar settings will return to their default values.  The
-dither algorithm setting is uneffected.  The <guilabel>Print Color
-Adjust</guilabel> window will close when the
-<guibutton>Close</guibutton> button is clicked.
-    </para>
-    </sect4>
-
-   </sect3>
-
-  </sect2>
-
-  <sect2><title id="sec-printing-and-saving-settings">Printing and Saving Settings</title>
-    <para>
-    At the bottom of the Gimp-Print window, there are five buttons labeled
-<guibutton>About</guibutton>,
-<guibutton>Print and Save Settings</guibutton>,
-<guibutton>Save Settings</guibutton>,
-<guibutton>Print</guibutton>,
-and <guibutton>Cancel</guibutton>.  The <guibutton>About</guibutton>
-button will show information about the Gutenprint software, such as
-the version number, authors names, project web site, and software
-licensing.  After clicking on the <guibutton>About</guibutton>, read
-the information, and then close the window by pressing the
-<guibutton>OK</guibutton> button.
-    </para>
-    <para>
-      The <guibutton>Print and Save Settings</guibutton> button will
-save the current settings and then print the desired image.  Recall
-that these settings are saved in <filename>~/.gimp-1.2/printrc</filename>.  The
-<guibutton>Save Settings</guibutton> button will only save the
-settings.  The <guibutton>Print</guibutton> button will print the
-image only.  The <guibutton>Cancel</guibutton> will close the
-Gimp-Print GUI window.
-    </para>
-  </sect2>
-
-  </sect1>
-
- </chapter>
diff --git a/doc/users_guide/history.sgml b/doc/users_guide/history.sgml
deleted file mode 100644
index 2782f2b..0000000
--- a/doc/users_guide/history.sgml
+++ /dev/null
@@ -1,108 +0,0 @@
-
-  <chapter><title>Project History</title>
-  <para>
-This software package was first written by Michael Sweet of
-<ulink url="http://www.easysw.com">Easy Software Products</ulink> and
-initially worked only as a print plugin to the GIMP (GNU Image
-Manipulation Program).  In the summer of 1999,
-Robert Krawitz (the current
-Gutenprint project leader) purchased an Epson Stylus Photo EX printer
-to feed his photography hobby. Finding no existing printer drivers, Robert
-adapted Mike's GIMP Print plugin to his six-color printer, and by the end
-of the year released version 3.0 of the Gimp-Print software, which was
-included in version 1.1 of the GIMP.  The intention was for this to be
-the stable plugin in version 1.2 of the GIMP while development of the
-GIMP Print plugin continued for later release.
-  </para>
-  <para>
-Robert put the Gimp-Print development tree on SourceForge starting
-with version 3.1, and quickly found a group of like-minded people who wanted to print
-high quality output on inexpensive inkjet printers. One of the main
-goals, which was not expected to be met until late in the version 3.1
-cycle, was to write a Ghostscript driver so that printing would not be
-restricted to the GIMP.  Imagine Robert's surprise when Henryk "Buggs"
-Richter wrote one within days!
-  </para>
-  <para>
-In July 2000, not more than a year after Robert bought his Epson
-Stylus Photo EX, he was invited to the Linux Printing
-Summit hosted by VA Linux Systems. In preparation for that, he spent
-long hours printing out test images.  Robert went back to the
-Gimp-Print version 3.0.9 release, which seemed like such an advance
-at the time,  and was floored at how far the project had come in four
-months! Output that had been considered impressive with using six
-colors was put to shame by four color output. That should give you
-an idea what six color and variable dot size printers can do. It also
-illustrates what a group of committed people can do.
-  </para>
-  <para>
-Robert came away from the Printing Summit with a lot of new ideas, and in
-November 2000, Gimp-Print version 4.0 was released, the culmination of 9 months
-of work by the team.  The quality was already tremendously improved
-over what the software could do at the Printing Summit.
-  </para>
-  <para>
-The team started serious work on version 4.1 in December
-2000, and version 4.2.0 was released in November 2001.  Despite the fact
-that version 4.2.0 is a "minor" release over version 4.0, there are vast
-improvements:
-  <itemizedlist>
-    <listitem>
-      <para>
-      The driver is built as a shared library, making it much easier
-to use by higher layers of software
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-      The packaging system now follows GNU standards
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-The print quality (in particular, color accuracy, a well-known weakness in 4.0) is even better
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-      Improved performance
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-      Many more options
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-      More supported printers
-      </para>
-    </listitem>
-
-  </itemizedlist>
-
-  </para>
-  <para>
-Releases of Gimp-Print have been historically numbered in
-a fashion similar to that of the Linux kernel, where major releases
-are denoted by the first digit (in this case '4'), while minor
-releases are denoted by subsequent digits (such as '4.2.0').  Even
-numbered minor releases are considered stable, while odd numbered
-minor releases are considered development releases (whose stability
-may vary for any given release).
-  </para>
-  <para>
-This project is by no means finished.  In future releases, the development
-team hopes to include the following:
-  <itemizedlist>
-    <listitem><para>implementation of proper color management</para></listitem>
-    <listitem><para>improved dithering</para></listitem>
-    <listitem><para>improvements in performance</para></listitem>
-  </itemizedlist>
-  </para>
-  <para>
-The entire Gutenprint team hopes you will really enjoy using this
-software!  For more information, please consult the Gutenprint project
-<ulink url="http://gimp-print.sourceforge.net">web page</ulink>.
-  </para>
-  </chapter>
diff --git a/doc/users_guide/html-stamp b/doc/users_guide/html-stamp
deleted file mode 100644
index e69de29..0000000
--- a/doc/users_guide/html-stamp
+++ /dev/null
diff --git a/doc/users_guide/html/book1.html b/doc/users_guide/html/book1.html
deleted file mode 100644
index 15d9f2e..0000000
--- a/doc/users_guide/html/book1.html
+++ /dev/null
@@ -1,487 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->The User's Guide to Gutenprint - Complete Edition</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="NEXT"
-TITLE="Project History"
-HREF="c29.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="BOOK"
-><DIV
-CLASS="BOOK"
-><A
-NAME="AEN1"
-></A
-><DIV
-CLASS="TITLEPAGE"
-><H1
-CLASS="TITLE"
-><A
-NAME="AEN2"
->The User's Guide to Gutenprint - Complete Edition</A
-></H1
-><H3
-CLASS="AUTHOR"
-><A
-NAME="AEN6"
-></A
->Andy Stewart</H3
-><P
-CLASS="COPYRIGHT"
-><A
-HREF="ln12.html"
->Copyright</A
-> &copy; 2002 Andy Stewart</P
-><DIV
-><DIV
-CLASS="ABSTRACT"
-><P
-></P
-><A
-NAME="AEN16"
-></A
-><P
->    The Gutenprint Top Quality Printer Drivers (hereafter
-called Gutenprint) are a set of printer drivers written to
-take advantage of the full capabilities of a wide range of
-printers. These drivers should work on any POSIX compliant operating
-system (e.g. Linux, Solaris, IRIX, etc).  This document will explain how to
-use the Gutenprint software to achieve high quality printouts from the
-<A
-HREF="http://www.gimp.org"
-TARGET="_top"
->GIMP</A
-> (GNU Image
-Manipulation Program) and
-<A
-HREF="http://www.cups.org"
-TARGET="_top"
->CUPS</A
-> (Common Unix Printing
-System).
-  </P
-><P
->    Please note that in addition to using the Gutenprint software as a
-print plugin for the GIMP, and as a set of printer drivers for CUPS, this
-software can also be compiled and used with the 
-<A
-HREF="http://www.ghostscript.com"
-TARGET="_top"
->Ghostscript</A
-> software
-and with the 
-<A
-HREF="http://www.linuxprinting.org/foomatic.html"
-TARGET="_top"
->Foomatic</A
-> 
-software.
-   </P
-><P
->Regardless of whether the Gutenprint software is used with the GIMP,
-CUPS, Ghostscript, or Foomatic, the print quality and printer settings
-remain the same.  However, use of the Gutenprint with Ghostscript and
-Foomatic is not covered in this document.  These topics may be covered
-in a future revision of this document.
-  </P
-><P
->  This document corresponds to version 4.2.0 and later of the Gutenprint
-software. This document will serve as a guide to the user, and as such
-will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
-Foomatic, or any other related software.
-  </P
-><P
->    Andy Stewart, the author, is the founder of the
-<A
-HREF="http://www.wlug.org"
-TARGET="_top"
->Worcester Linux Users' Group</A
-> in
-Worcester, Massachusetts, USA.  The group was founded in July 1997 and has
-approximately 140 people on its mailing list.  Monthly meetings are
-held and all are invited.
-  </P
-><P
->    In terms of "code", this is the author's first contribution to the
-open source community, and definitely his first experience with DocBook.
-Constructive comments, praise, words of encouragement, and the like
-will be most appreciated if e-mailed to the
-<A
-HREF="mailto:andystewart@attbi.com"
-TARGET="_top"
->author</A
->.
-  </P
-><P
-></P
-></DIV
-></DIV
-><HR></DIV
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->1. <A
-HREF="c29.html"
->Project History</A
-></DT
-><DT
->2. <A
-HREF="ch-gimp-and-gimp-print.html"
->GIMP and Gutenprint</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="ch-gimp-and-gimp-print.html#AEN63"
->Running the GIMP</A
-></DT
-><DT
-><A
-HREF="x85.html"
->The Gimp-Print Graphical User Interface</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="x85.html#AEN130"
->Printer Settings</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN230"
->Preview</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN254"
->Position</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN326"
->Size</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN353"
->Image/Output Settings</A
-></DT
-><DT
-><A
-HREF="x85.html#AEN426"
->Printing and Saving Settings</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->3. <A
-HREF="c443.html"
->CUPS and Gutenprint</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="c443.html#AEN445"
->Introduction</A
-></DT
-><DT
-><A
-HREF="x452.html"
->CUPS Printer Installation</A
-></DT
-><DT
-><A
-HREF="x544.html"
->Configuring your Printer in CUPS</A
-></DT
-><DT
-><A
-HREF="x559.html"
->Using CUPS from the Command Line</A
-></DT
-></DL
-></DD
-><DT
->4. <A
-HREF="c568.html"
->Gutenprint Utilities</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="c568.html#AEN570"
->escputil</A
-></DT
-><DD
-><DL
-><DT
-><A
-HREF="c568.html#AEN582"
->Determining Ink Level</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN591"
->Error During Ink Level Determination</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN595"
->Nozzle Check</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN600"
->Clean the Print Head</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN606"
->Align the Print Head</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN622"
->Printer Identification</A
-></DT
-><DT
-><A
-HREF="c568.html#AEN626"
->More Information</A
-></DT
-></DL
-></DD
-></DL
-></DD
-><DT
->A. <A
-HREF="gfdl.html"
->GNU Free Documentation License</A
-></DT
-><DD
-><DL
-><DT
->0. <A
-HREF="gfdl.html#AEN635"
->PREAMBLE</A
-></DT
-><DT
->1. <A
-HREF="x640.html"
->APPLICABILITY AND DEFINITIONS</A
-></DT
-><DT
->2. <A
-HREF="x650.html"
->VERBATIM COPYING</A
-></DT
-><DT
->3. <A
-HREF="x654.html"
->COPYING IN QUANTITY</A
-></DT
-><DT
->4. <A
-HREF="x660.html"
->MODIFICATIONS</A
-></DT
-><DT
->5. <A
-HREF="x696.html"
->COMBINING DOCUMENTS</A
-></DT
-><DT
->6. <A
-HREF="x701.html"
->COLLECTIONS OF DOCUMENTS</A
-></DT
-><DT
->7. <A
-HREF="x705.html"
->AGGREGATION WITH INDEPENDENT WORKS</A
-></DT
-><DT
->8. <A
-HREF="x709.html"
->TRANSLATION</A
-></DT
-><DT
->9. <A
-HREF="x712.html"
->TERMINATION</A
-></DT
-><DT
->10. <A
-HREF="x715.html"
->FUTURE REVISIONS OF THIS LICENSE</A
-></DT
-><DT
-><A
-HREF="x720.html"
->How to use this License for your documents</A
-></DT
-></DL
-></DD
-></DL
-></DIV
-><DIV
-CLASS="LOT"
-><DL
-CLASS="LOT"
-><DT
-><B
->List of Figures</B
-></DT
-><DT
->2-1. <A
-HREF="ch-gimp-and-gimp-print.html#AEN67"
->The Startup Window for The GIMP</A
-></DT
-><DT
->2-2. <A
-HREF="ch-gimp-and-gimp-print.html#AEN78"
->A Sample Image Displayed by The GIMP</A
-></DT
-><DT
->2-3. <A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->The Gimp-Print Graphical User Interface 1 (GUI)</A
-></DT
-><DT
->2-4. <A
-HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
->The Gimp-Print Graphical User Interface 2 (GUI)</A
-></DT
-><DT
->2-5. <A
-HREF="x85.html#AEN153"
->The Setup Printer Window</A
-></DT
-><DT
->2-6. <A
-HREF="x85.html#AEN168"
->The New Printer Window</A
-></DT
-><DT
->2-7. <A
-HREF="x85.html#FIG-GIMP-PRINT-COLOR-ADJUST"
->The Print Color Adjust Window</A
-></DT
-><DT
->3-1. <A
-HREF="x452.html#AEN456"
->The CUPS Startup Window</A
-></DT
-><DT
->3-2. <A
-HREF="x452.html#AEN466"
->The CUPS Printers Window</A
-></DT
-><DT
->3-3. <A
-HREF="x452.html#AEN475"
->The CUPS Admin Window</A
-></DT
-><DT
->3-4. <A
-HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
->The CUPS Admin Device Window</A
-></DT
-><DT
->3-5. <A
-HREF="x452.html#AEN494"
->The CUPS Admin Model/Driver Window</A
-></DT
-><DT
->3-6. <A
-HREF="x452.html#FIG-CUPS-ADMIN-MODEL"
->The 2nd CUPS Admin Model/Driver Window</A
-></DT
-><DT
->3-7. <A
-HREF="x452.html#AEN526"
->The CUPS Admin Success Window</A
-></DT
-><DT
->3-8. <A
-HREF="x452.html#FIG-CUPS-MY-PRINTER"
->The CUPS Window for Your Printer</A
-></DT
-><DT
->3-9. <A
-HREF="x544.html#FIG-CUPS-PRINTER-CONFIG-WINDOW"
->The CUPS Printer Cofiguration Window</A
-></DT
-></DL
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="c29.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Project History</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/c29.html b/doc/users_guide/html/c29.html
deleted file mode 100644
index e178bd0..0000000
--- a/doc/users_guide/html/c29.html
+++ /dev/null
@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->Project History</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="NEXT"
-TITLE="GIMP and Gutenprint"
-HREF="ch-gimp-and-gimp-print.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="book1.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AEN29"
-></A
->Chapter 1. Project History</H1
-><P
->This software package was first written by Michael Sweet of
-<A
-HREF="http://www.easysw.com"
-TARGET="_top"
->Easy Software Products</A
-> and
-initially worked only as a print plugin to the GIMP (GNU Image
-Manipulation Program).  In the summer of 1999,
-Robert Krawitz (the current
-Gutenprint project leader) purchased an Epson Stylus Photo EX printer
-to feed his photography hobby. Finding no existing printer drivers, Robert
-adapted Mike's GIMP Print plugin to his six-color printer, and by the end
-of the year released version 3.0 of the Gimp-Print software, which was
-included in version 1.1 of the GIMP.  The intention was for this to be
-the stable plugin in version 1.2 of the GIMP while development of the
-GIMP Print plugin continued for later release.
-  </P
-><P
->Robert put the Gimp-Print development tree on SourceForge starting
-with version 3.1, and quickly found a group of like-minded people who wanted to print
-high quality output on inexpensive inkjet printers. One of the main
-goals, which was not expected to be met until late in the version 3.1
-cycle, was to write a Ghostscript driver so that printing would not be
-restricted to the GIMP.  Imagine Robert's surprise when Henryk "Buggs"
-Richter wrote one within days!
-  </P
-><P
->In July 2000, not more than a year after Robert bought his Epson
-Stylus Photo EX, he was invited to the Linux Printing
-Summit hosted by VA Linux Systems. In preparation for that, he spent
-long hours printing out test images.  Robert went back to the
-Gimp-Print version 3.0.9 release, which seemed like such an advance
-at the time,  and was floored at how far the project had come in four
-months! Output that had been considered impressive with using six
-colors was put to shame by four color output. That should give you
-an idea what six color and variable dot size printers can do. It also
-illustrates what a group of committed people can do.
-  </P
-><P
->Robert came away from the Printing Summit with a lot of new ideas, and in
-November 2000, Gimp-Print version 4.0 was released, the culmination of 9 months
-of work by the team.  The quality was already tremendously improved
-over what the software could do at the Printing Summit.
-  </P
-><P
->The team started serious work on version 4.1 in December
-2000, and version 4.2.0 was released in November 2001.  Despite the fact
-that version 4.2.0 is a "minor" release over version 4.0, there are vast
-improvements:
-  <P
-></P
-><UL
-><LI
-><P
->      The driver is built as a shared library, making it much easier
-to use by higher layers of software
-      </P
-></LI
-><LI
-><P
->      The packaging system now follows GNU standards
-      </P
-></LI
-><LI
-><P
->The print quality (in particular, color accuracy, a well-known weakness in 4.0) is even better
-      </P
-></LI
-><LI
-><P
->      Improved performance
-      </P
-></LI
-><LI
-><P
->      Many more options
-      </P
-></LI
-><LI
-><P
->      More supported printers
-      </P
-></LI
-></UL
->
-
-  </P
-><P
->Releases of Gimp-Print have been historically numbered in
-a fashion similar to that of the Linux kernel, where major releases
-are denoted by the first digit (in this case '4'), while minor
-releases are denoted by subsequent digits (such as '4.2.0').  Even
-numbered minor releases are considered stable, while odd numbered
-minor releases are considered development releases (whose stability
-may vary for any given release).
-  </P
-><P
->This project is by no means finished.  In future releases, the development
-team hopes to include the following:
-  <P
-></P
-><UL
-><LI
-><P
->implementation of proper color management</P
-></LI
-><LI
-><P
->improved dithering</P
-></LI
-><LI
-><P
->improvements in performance</P
-></LI
-></UL
->
-  </P
-><P
->The entire Gutenprint team hopes you will really enjoy using this
-software!  For more information, please consult the Gutenprint project
-<A
-HREF="http://gimp-print.sourceforge.net"
-TARGET="_top"
->web page</A
->.
-  </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->The User's Guide to Gutenprint - Complete Edition</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->GIMP and Gutenprint</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/c443.html b/doc/users_guide/html/c443.html
deleted file mode 100644
index 00adba4..0000000
--- a/doc/users_guide/html/c443.html
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->CUPS and Gutenprint</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="The Gimp-Print Graphical User Interface"
-HREF="x85.html"><LINK
-REL="NEXT"
-TITLE="CUPS Printer Installation"
-HREF="x452.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x85.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x452.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AEN443"
-></A
->Chapter 3. CUPS and Gutenprint</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="c443.html#AEN445"
->Introduction</A
-></DT
-><DT
-><A
-HREF="x452.html"
->CUPS Printer Installation</A
-></DT
-><DT
-><A
-HREF="x544.html"
->Configuring your Printer in CUPS</A
-></DT
-><DT
-><A
-HREF="x559.html"
->Using CUPS from the Command Line</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN445"
->Introduction</A
-></H1
-><P
->       CUPS is an acronym which stands for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->C</I
-></SPAN
->ommon
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->U</I
-></SPAN
->nix <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->P</I
-></SPAN
->rinting
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->S</I
-></SPAN
->ystem.  It is assumed that the reader has
-properly installed the CUPS software and the Gutenprint software.
-This section will discuss adding a printer to CUPS that uses a
-Gutenprint printer driver, as well as how to modify the various
-settings supplied by Gutenprint. This will be a rather quick
-explanation, as the CUPS software is quite well documented, and it is
-not my intention to attempt to duplicate the CUPS documentation here.
-     </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x85.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x452.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->The Gimp-Print Graphical User Interface</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->CUPS Printer Installation</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/c568.html b/doc/users_guide/html/c568.html
deleted file mode 100644
index 571ca63..0000000
--- a/doc/users_guide/html/c568.html
+++ /dev/null
@@ -1,754 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->Gutenprint Utilities</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="Using CUPS from the Command Line"
-HREF="x559.html"><LINK
-REL="NEXT"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x559.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="gfdl.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="AEN568"
-></A
->Chapter 4. Gutenprint Utilities</H1
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN570"
->escputil</A
-></H1
-><P
->       <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> is a command line utility which
-allows the user to perform a variety of maintenance tasks on Epson
-Stylus inkjet printers.  These tasks include head alignment, head
-cleaning, nozzle check, printer identification, and retrieval of the ink
-level from the printer.  In order for many of the
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> functions to work, the user must have
-read/write access to the raw printer device (typically /dev/lp0,
-/dev/usb/lp0, and the like).  In general, these operations should be
-performed by the root user.  As always, the user must insure that the
-directory containing the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility is
-listed in the &dollar;PATH environment variable, or that the full path is
-specified on the command line.  The examples in this section will
-assume the former.
-     </P
-><DIV
-CLASS="CAUTION"
-><P
-></P
-><TABLE
-CLASS="CAUTION"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Caution</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
->       The <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility was designed for use
-ONLY with Epson Stylus inkjet printers supported by the Gutenprint
-software.  It is possible that damage MIGHT occur to your printer if
-this utility is misused or if it is used with a printer other than an
-Epson Stylus inkjet printer.  It is the sole responsibility of the
-user to insure that this utility is suitable for the task at hand.
-     </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
->       In this section, specific examples of common usage will be
-presented.  A summary of the command line switches can be
-found in the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
->(1) man page.
-     </P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN582"
->Determining Ink Level</A
-></H2
-><P
->       Perhaps the most basic function performed by
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> is that of determining the amount of ink
-remaining in the printer. To do this, the user must know the name of
-the raw printer device.  This is usually /dev/lp0 for a printer
-connected to the parallel port, or /dev/usb/lp0 for a printer
-connected to the USB.  
-     </P
-><P
->If there are multiple printers connected, one of them may be referenced as
-/dev/lp1 or perhaps /dev/usb/lp1.  In the event of uncertainty, and if
-CUPS is in use, view the following <A
-HREF="http://localhost:631/printers"
-TARGET="_top"
->URL</A
-> 
-with a web browser. At that URL, look for a line which reads "Device
-URI".  The author's USB printer is listed as "Device URI:  usb:/dev/usb/lp0".
-     </P
-><P
->For this example, assume that the raw printer device is a USB printer
-specified as /dev/usb/lp0.  To get the ink level for this printer,
-issue this command and notice the output.
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-# escputil -r /dev/usb/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details. 
-
-           Ink color    Percent remaining
-               Black     18
-                Cyan     71
-             Magenta     70
-              Yellow     67
-          Light Cyan     71
-       Light Magenta     70
-    
-  </PRE
-></TD
-></TR
-></TABLE
-><P
->The user would substitute their own raw printer device for the one
-shown in the example after the "-r" switch.  Notice that the printout
-shows the percent of ink remaining for each color of the author's
-Epson Stylus Photo 870.  When the ink levels get too low, print
-quality will suffer.  In the author's personal experience, ink levels
-approaching 10% begin to cause print quality degredation, but this
-will vary depending on the precise printer model.
-     </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN591"
->Error During Ink Level Determination</A
-></H2
-><P
->       What?  The example above did not work?  An error message was
-printed?  What does it mean?  There are several possibilities,
-depending on the specific error message.  If the error message is
-"Invalid argument" (see following example), the problem is that the
-2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled.
-
-  <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-# escputil -r /dev/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details.
-
-Cannot read from /dev/lp0: Invalid argument
-    
-  </PRE
-></TD
-></TR
-></TABLE
->
-
-     Another possibile cause for error is that the raw printer device
-does not have both read and write permission for the user attempting
-to access the device.  In this case, the error message will read
-"Permission denied".  A final possibility is that the raw printer
-device specified is incorrect, in which case the error message will
-read "No such device".
-   </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN595"
->Nozzle Check</A
-></H2
-><P
->       On an inkjet printer, there are several small holes on the
-bottom of each ink cartridge through which the ink must flow smoothly
-in order to create high quality images on paper.  If these holes
-become clogged, the printed image will show small gaps where there
-should have been ink.  One can easily test for the existence of this
-condition by running a nozzle check.  One need not be the root user to
-issue this command.  Note that as shown, the command will print a
-nozzle test pattern on the default printer.  If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
-     </P
-><P
->       The printer will print a series of black (and colored) slanted
-lines on the paper.  Observe these lines carefully.  If there are gaps
-or spaces in these lines, then the corresponding nozzle is clogged and
-the print head must be cleaned.  However, if there are no gaps, the 
-nozzles are clean.
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-# escputil -n       
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details. 
-
-Running nozzle check, please ensure paper is in the printer.
-    
-  </PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN600"
->Clean the Print Head</A
-></H2
-><P
->       If the printed output is showing gaps where there should have
-been ink, it is likely that one or more nozzles are clogged and the
-print head is in need of cleaning.  One can verify this by first
-running a nozzle check and looking for gaps in the printout.  To clean
-the print head, issue the following command.  One need not be the root user to
-issue this command.  Note that as shown, the command will clean the
-print head on the default printer.  If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-# escputil -c
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details. 
-
-Cleaning heads...
-    
-  </PRE
-></TD
-></TR
-></TABLE
-><P
->       Nothing will be printed on the paper.  The printer will make
-some noise as it cleans the print head.  Wait until the printer is
-finished cleaning the print head.  Afterwards, execute another nozzle
-check and insure that the print head is indeed completely clean.  Note
-that the process of cleaning the print head causes ink consumption, so
-do not clean the print head any more than necessary.
-     </P
-><P
->For severely clogged nozzles, one may have to execute two or three cycles
-of nozzle check followed by a cleaning of the print head.  If the
-printer had gone unused for a long time, the nozzles may be so clogged
-with dried ink as to be unrecoverable, in which case, the best course
-of action is to replace the ink cartridge.
-     </P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN606"
->Align the Print Head</A
-></H2
-><P
->       To insure the highest quality printouts, the print head must
-be in proper physical alignment.  One can check and realign the print
-head by running this interactive alignment test.  
-     </P
-><P
->The <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility must know the exact printer model in
-use.  One may specify the model on the command line using the "-m"
-switch, or the utility can detect the printer model if the user passes
-the "-r" switch and the name of the raw printer device.  
-     </P
-><P
->Note that an unprivileged user may use this command with the "-m" switch, but that
-(in general) the root user may only use the "-r" switch (which
-requires read/write access to the raw printer device).  In the case of
-multiple printers in use, the "-P" switch is required to align the
-print head on the non-default printer.
-     </P
-><DIV
-CLASS="CAUTION"
-><P
-></P
-><TABLE
-CLASS="CAUTION"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Caution</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
->This utility lets you align the print head of your Epson Stylus inkjet
-printer.  Misuse of this utility may cause your print quality to degrade
-and possibly damage your printer.  This utility has not been reviewed by
-Seiko Epson for correctness, and is offered with no warranty at all.  The
-entire risk of using this utility lies with you.
-     </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
->       Aligning the print head is an interactive process.  The utility
-will print out a set of instructions and ask you for responses.  Please
-read the instructions carefully and follow them precisely.  A single
-sheet of paper will be needed (one can print on both sides to save paper).
-     </P
-><P
->The following example illustrates the alignment process when issued by an
-unprivileged user who specified the printer model on the command
-line.  (To obtain a list of printer models, issue the "escputil -M"
-command).  Of course, your responses will vary and should be
-substituted for the responses shown in the following example.
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-
-*** NOTE - 870 is an illustrative example! ***
-*** You MUST use the proper printer model! ***
-*** Run:  escputil -M for a listing of     ***
-*** supported printer models!              ***
-
-linuxpc&#62; escputil -a -m 870
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Please read these instructions very carefully before proceeding.
-
-This utility lets you align the print head of your Epson Stylus 
-inkjet printer.  Misuse of this utility may cause your print 
-quality to degrade and possibly damage your printer.  This utility
-has not been reviewed by Seiko Epson for correctness, and is 
-offered with no warranty at all.  The entire risk of using this 
-utility lies with you.
-
-This utility prints 3 test patterns.  Each pattern looks very
-similar.  The patterns consist of a series of pairs of vertical
-lines that overlap.  Below each pair of lines is a number between 
-1 and 15.
-
-When you inspect the pairs of lines, you should find the pair
-of lines that is best in alignment, that is, that best forms 
-a single vertical line.  Inspect the pairs very carefully to 
-find the best match.  Using a loupe or magnifying glass is 
-recommended for the most critical inspection.  It is also 
-suggested that you use a good quality paper for the test, so 
-that the lines are well-formed and do not spread through the 
-paper.  After picking the number matching the best pair, place 
-the paper back in the paper input tray before typing it in.
-
-Each pattern is similar, but later patterns use finer dots for
-more critical alignment.  You must run all of the passes to 
-correctly align your printer.  After running all the alignment
-passes, the alignment patterns will be printed once more.  You 
-should find that the middle-most pair (#8 out of the 15) is the
-best for all patterns. 
-
-After the passes are printed once more, you will be offered the
-choices of (s)aving the result in the printer, (r)epeating the
-process, or (q)uitting without saving.  Quitting will not restore
-the previous settings, but powering the printer off and back 
-on will.  If you quit, you must repeat the entire process if 
-you wish to later save the results.  It is essential that you 
-not turn your printer off during this procedure.
-
-This procedure assumes that your printer is an Epson Stylus Photo
-870.  If this is not your printer model, please type control-C now
-and choose your actual printer model.
-
-Please place a sheet of paper in your printer to begin the head
-alignment procedure. 
-Press enter to continue &#62; 
-Please inspect the print, and choose the best pair of lines in 
-each pattern.  Type a pair number, '?' for help, or 'r' to repeat
-the procedure.
-Pass #1&#62; 8
-Pass #2&#62; 8
-Pass #3&#62; 8
-Attempting to set alignment...succeeded.
-Please verify that the alignment is correct.  After the alignment
-pattern is printed again, please ensure that the best pattern 
-for each line is pattern 8.  If it is not, you should repeat the 
-process to get the best quality printing. 
-Please insert a fresh sheet of paper.
-Press enter to continue &#62; 
-Please inspect the final output very carefully to ensure that your
-printer is in proper alignment. You may now: 
-  (s)ave the results in the printer,
-  (q)uit without saving the results, or
-  (r)epeat the entire process from the beginning.
-You will then be asked to confirm your choice.
-What do you want to do (s, q, r)?
-&#62; s
-This will permanently alter the configuration of your printer.
-WARNING: this procedure has not been approved by Seiko Epson, 
-and it may damage your printer. Proceed? 
-Please confirm by typing 's' again that you wish to save the 
-settings to your printer: 
-&#62; s
-About to save settings...succeeded!
-Your alignment settings have been saved to the printer.
-    
-  </PRE
-></TD
-></TR
-></TABLE
-><P
->      The following example shows what will happen if an unprivileged
-user attempts to align the print head by specifying the raw printer
-device on the command line.
-    </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-linuxpc&#62; escputil -a -r /dev/usb/lp0
-Escputil version 4.2.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...
-Cannot open /dev/usb/lp0 read/write: Permission denied
-    
-  </PRE
-></TD
-></TR
-></TABLE
-><P
->      This next example illustrates the results obtained when the root
-user issues an alignment command while specifying the raw printer
-device.  Note that the output is truncated and only shows the printer
-detection output.
-    </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-# escputil -a -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...Stylus Photo 870
-
-Please read these instructions very carefully before proceeding.
-    
-  </PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN622"
->Printer Identification</A
-></H2
-><P
->       The printer identification command will query the printer for
-make and model information.  This command requires read/write access
-to the raw printer device (generally limited to the root user).
-Substitute your own raw printer device in place of the /dev/usb/lp0
-shown in the example.  The output will vary depending on the precise
-printer model.
-     </P
-><TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-# escputil -d -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-@EJL ID
-MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
-EPSON Stylus Photo 870;
-    
-  </PRE
-></TD
-></TR
-></TABLE
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN626"
->More Information</A
-></H2
-><P
->       For more detailed information about the command line switches
-accepted by the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->escputil</I
-></SPAN
-> utility, please consult
-the man page which is supplied with the Gutenprint software.  The user
-may also issue the "escputil --help" command to get a listing of supported
-command line switches.  The command requires no special privileges to execute.
-     </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x559.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Using CUPS from the Command Line</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->GNU Free Documentation License</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/ch-gimp-and-gimp-print.html b/doc/users_guide/html/ch-gimp-and-gimp-print.html
deleted file mode 100644
index e557aea..0000000
--- a/doc/users_guide/html/ch-gimp-and-gimp-print.html
+++ /dev/null
@@ -1,245 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->GIMP and Gutenprint</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="Project History"
-HREF="c29.html"><LINK
-REL="NEXT"
-TITLE="The Gimp-Print Graphical User Interface"
-HREF="x85.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="CHAPTER"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="c29.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x85.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="CHAPTER"
-><H1
-><A
-NAME="CH-GIMP-AND-GIMP-PRINT"
-></A
->Chapter 2. GIMP and Gutenprint</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
-><A
-HREF="ch-gimp-and-gimp-print.html#AEN63"
->Running the GIMP</A
-></DT
-><DT
-><A
-HREF="x85.html"
->The Gimp-Print Graphical User Interface</A
-></DT
-></DL
-></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN63"
->Running the GIMP</A
-></H1
-><P
->   This section assumes that you have the GIMP version 1.2 installed
-and working properly on your computer, and that you have an image of
-some type that you desire to print. To get started quickly, log into
-your system, start the X window system, and bring up your favorite terminal
-window.  At the $ prompt, type:
-
-  <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->  
-     $ gimp &#38;
-    
-  </PRE
-></TD
-></TR
-></TABLE
->
-
-   This should start the GIMP for you. If it does not, check that
-you have installed the GIMP properly, and that its binary is located
-in one of the directories listed in your &dollar;PATH environment
-variable. On the assumption that this worked, the screen should now
-look something like this:
-
-   <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN67"
-></A
-><P
-><B
->Figure 2-1. The Startup Window for The GIMP</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp_startup.png"></P
-></DIV
-></DIV
->
-
-   </P
-><P
->   At this point, you should use the
-
-    <SPAN
-CLASS="GUIMENU"
->File</SPAN
->-&gt;<SPAN
-CLASS="GUIMENUITEM"
->Open</SPAN
->
-
-menu option to open your favorite picture. We will print this picture
-shortly. Your picture should be displayed next to the GIMP startup
-window, perhaps looking similar to the following (sssh! Don't tell
-anybody the secret!):
-
-   <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN78"
-></A
-><P
-><B
->Figure 2-2. A Sample Image Displayed by The GIMP</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp_image.png"></P
-></DIV
-></DIV
->
-
-  </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="c29.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x85.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Project History</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->The Gimp-Print Graphical User Interface</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/docbook.css b/doc/users_guide/html/docbook.css
deleted file mode 100644
index 0f90516..0000000
--- a/doc/users_guide/html/docbook.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.NAVHEADER { display: none }
-.NAVFOOTER { display: none }
-.TOC       { display: none }
-
-.NAVTOC    { margin-left: 15;
-             display: none }
-
-.NAVBTN    { font-size: 10pt }
-
-.TOCTITLE  { font-size: 10pt;
-             color: blue;
- 	     text-decoration: underline; }
diff --git a/doc/users_guide/html/gfdl.html b/doc/users_guide/html/gfdl.html
deleted file mode 100644
index c70ea3c..0000000
--- a/doc/users_guide/html/gfdl.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->GNU Free Documentation License</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="PREVIOUS"
-TITLE="Gutenprint Utilities"
-HREF="c568.html"><LINK
-REL="NEXT"
-TITLE="APPLICABILITY AND DEFINITIONS"
-HREF="x640.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="APPENDIX"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="c568.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
-></TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x640.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="APPENDIX"
-><H1
-><A
-NAME="GFDL"
-></A
->Appendix A. GNU Free Documentation License</H1
-><DIV
-CLASS="TOC"
-><DL
-><DT
-><B
->Table of Contents</B
-></DT
-><DT
->0. <A
-HREF="gfdl.html#AEN635"
->PREAMBLE</A
-></DT
-><DT
->1. <A
-HREF="x640.html"
->APPLICABILITY AND DEFINITIONS</A
-></DT
-><DT
->2. <A
-HREF="x650.html"
->VERBATIM COPYING</A
-></DT
-><DT
->3. <A
-HREF="x654.html"
->COPYING IN QUANTITY</A
-></DT
-><DT
->4. <A
-HREF="x660.html"
->MODIFICATIONS</A
-></DT
-><DT
->5. <A
-HREF="x696.html"
->COMBINING DOCUMENTS</A
-></DT
-><DT
->6. <A
-HREF="x701.html"
->COLLECTIONS OF DOCUMENTS</A
-></DT
-><DT
->7. <A
-HREF="x705.html"
->AGGREGATION WITH INDEPENDENT WORKS</A
-></DT
-><DT
->8. <A
-HREF="x709.html"
->TRANSLATION</A
-></DT
-><DT
->9. <A
-HREF="x712.html"
->TERMINATION</A
-></DT
-><DT
->10. <A
-HREF="x715.html"
->FUTURE REVISIONS OF THIS LICENSE</A
-></DT
-><DT
-><A
-HREF="x720.html"
->How to use this License for your documents</A
-></DT
-></DL
-></DIV
-><P
->Version 1.1, March 2000</P
-><A
-NAME="AEN633"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
->Copyright (C) 2000  Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.</P
-></BLOCKQUOTE
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN635"
->0. PREAMBLE</A
-></H1
-><P
->The purpose of this License is to make a manual, textbook,
-    or other written document "free" in the sense of freedom: to
-    assure everyone the effective freedom to copy and redistribute it,
-    with or without modifying it, either commercially or
-    noncommercially.  Secondarily, this License preserves for the
-    author and publisher a way to get credit for their work, while not
-    being considered responsible for modifications made by
-    others.</P
-><P
->This License is a kind of "copyleft", which means that
-    derivative works of the document must themselves be free in the
-    same sense.  It complements the GNU General Public License, which
-    is a copyleft license designed for free software.</P
-><P
->We have designed this License in order to use it for manuals
-    for free software, because free software needs free documentation:
-    a free program should come with manuals providing the same
-    freedoms that the software does.  But this License is not limited
-    to software manuals; it can be used for any textual work,
-    regardless of subject matter or whether it is published as a
-    printed book.  We recommend this License principally for works
-    whose purpose is instruction or reference.</P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="c568.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x640.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Gutenprint Utilities</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->APPLICABILITY AND DEFINITIONS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/ln12.html b/doc/users_guide/html/ln12.html
deleted file mode 100644
index 737b50d..0000000
--- a/doc/users_guide/html/ln12.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="NEXT"
-TITLE="Project History"
-HREF="c29.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="LEGALNOTICE"
-><P
-></P
-><A
-NAME="AEN12"
-></A
-><P
->The User's Guide to Gutenprint - Complete Edition,
-Copyright 2002, Andy Stewart. 
-    </P
-><P
->    Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.1 or any later version published by the Free Software
-Foundation with no invariant sections, no Front-Cover texts, and no
-Back-Cover texts.  A copy of the license is included in <A
-HREF="gfdl.html"
->Appendix A</A
->.
-    </P
-><P
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->&nbsp;</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/stylesheet-images/caution.gif b/doc/users_guide/html/stylesheet-images/caution.gif
deleted file mode 100644
index 9cc2e15..0000000
--- a/doc/users_guide/html/stylesheet-images/caution.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/home.gif b/doc/users_guide/html/stylesheet-images/home.gif
deleted file mode 100644
index 55e1d59..0000000
--- a/doc/users_guide/html/stylesheet-images/home.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/important.gif b/doc/users_guide/html/stylesheet-images/important.gif
deleted file mode 100644
index 25e40c7..0000000
--- a/doc/users_guide/html/stylesheet-images/important.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/next.gif b/doc/users_guide/html/stylesheet-images/next.gif
deleted file mode 100644
index 8c502e7..0000000
--- a/doc/users_guide/html/stylesheet-images/next.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/note.gif b/doc/users_guide/html/stylesheet-images/note.gif
deleted file mode 100644
index 7322e8e..0000000
--- a/doc/users_guide/html/stylesheet-images/note.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/prev.gif b/doc/users_guide/html/stylesheet-images/prev.gif
deleted file mode 100644
index 0894d9e..0000000
--- a/doc/users_guide/html/stylesheet-images/prev.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/tip.gif b/doc/users_guide/html/stylesheet-images/tip.gif
deleted file mode 100644
index f062955..0000000
--- a/doc/users_guide/html/stylesheet-images/tip.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/toc-blank.gif b/doc/users_guide/html/stylesheet-images/toc-blank.gif
deleted file mode 100644
index 6c65e3a..0000000
--- a/doc/users_guide/html/stylesheet-images/toc-blank.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/toc-minus.gif b/doc/users_guide/html/stylesheet-images/toc-minus.gif
deleted file mode 100644
index 40ebe61..0000000
--- a/doc/users_guide/html/stylesheet-images/toc-minus.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/toc-plus.gif b/doc/users_guide/html/stylesheet-images/toc-plus.gif
deleted file mode 100644
index 3e9e7d5..0000000
--- a/doc/users_guide/html/stylesheet-images/toc-plus.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/up.gif b/doc/users_guide/html/stylesheet-images/up.gif
deleted file mode 100644
index e899a27..0000000
--- a/doc/users_guide/html/stylesheet-images/up.gif
+++ /dev/null
diff --git a/doc/users_guide/html/stylesheet-images/warning.gif b/doc/users_guide/html/stylesheet-images/warning.gif
deleted file mode 100644
index a587079..0000000
--- a/doc/users_guide/html/stylesheet-images/warning.gif
+++ /dev/null
diff --git a/doc/users_guide/html/x452.html b/doc/users_guide/html/x452.html
deleted file mode 100644
index ef5aebb..0000000
--- a/doc/users_guide/html/x452.html
+++ /dev/null
@@ -1,456 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->CUPS Printer Installation</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="PREVIOUS"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="NEXT"
-TITLE="Configuring your Printer in CUPS"
-HREF="x544.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="c443.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. CUPS and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x544.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN452"
->CUPS Printer Installation</A
-></H1
-><P
->This explanation will use the web interface provided by CUPS. First,
-aim your favorite web browser at
-<A
-HREF="http://localhost:631"
-TARGET="_top"
->the CUPS server</A
->.  The
-following screen should appear within your browser.
-    </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN456"
-></A
-><P
-><B
->Figure 3-1. The CUPS Startup Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_startup.png"></P
-></DIV
-></DIV
-><P
->Now, you may click on either the word <SPAN
-CLASS="GUILABEL"
->Printers</SPAN
-> in the bar at the top
-of the page, or you may click on the <SPAN
-CLASS="GUILABEL"
->Manage Printers</SPAN
-> text.  In
-either case, the next screen you see will look like this one if you
-have not yet configured any printers.
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN466"
-></A
-><P
-><B
->Figure 3-2. The CUPS Printers Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_printers.png"></P
-></DIV
-></DIV
-><P
->At this time, click on the <SPAN
-CLASS="GUIBUTTON"
->Add Printer</SPAN
-> button.
-You will then see the Admin screen (shown below).
-    </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN475"
-></A
-><P
-><B
->Figure 3-3. The CUPS Admin Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin.png"></P
-></DIV
-></DIV
-><P
->Notice in the screenshot that the three boxes are shown after the
-author filled them in for his printer at home.  You will need to fill
-in an appropriate name of your printer, its location, and a
-description which meets your own needs.  Once this is done, click on
-the <SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button, and then this screen will appear.
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-ADMIN-DEVICE"
-></A
-><P
-><B
->Figure 3-4. The CUPS Admin Device Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_device.png"></P
-></DIV
-></DIV
-><P
->Click on the drop down menu next to the word
-<SPAN
-CLASS="GUILABEL"
->Device</SPAN
-> and a list of possible printer devices
-appears.  Select the device appropriate for your printer.  Note that
-there are a range of serial, parallel, USB, and other devices from
-which to choose.  Once the selection is made, click the
-<SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button.  Now, this screen appears.
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN494"
-></A
-><P
-><B
->Figure 3-5. The CUPS Admin Model/Driver Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_make.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="CAUTION"
-><P
-></P
-><TABLE
-CLASS="CAUTION"
-BORDER="1"
-WIDTH="100%"
-><TR
-><TD
-ALIGN="CENTER"
-><B
->Caution Regarding USB Printers</B
-></TD
-></TR
-><TR
-><TD
-ALIGN="LEFT"
-><P
->CUPS versions 1.1.11 and later <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->REQUIRE</I
-></SPAN
->
-the user to insure that the desired USB printer is powered on
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->AND</I
-></SPAN
-> physically connected to the USB bus
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->BEFORE</I
-></SPAN
-> starting the CUPS software.  
-   </P
-><P
->CUPS must see the USB printer when the software starts.  The CUPS software
-is typically started when the computer boots.  Note that one cannot
-simply plug in the USB printer and power it on after CUPS has started.
-(Note that this does not apply to parallel port printers).
-   </P
-><P
->If the USB printer was not connected and powered on at the time CUPS was
-started, there will not be a USB printer shown in the
-list of devices on the CUPS Admin Device Window (see 
-<A
-HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
->Figure 3-4</A
->).  In this event, stop the CUPS
-software, properly connect and power on the USB printer, and restart
-the CUPS software.
-   </P
-><P
->From the list of devices shown in the CUPS Admin Device Window
-(see <A
-HREF="x452.html#FIG-CUPS-ADMIN-DEVICE"
->Figure 3-4</A
->), a clever user might
-attempt to avoid this issue by selecting 
-<SPAN
-CLASS="GUIMENUITEM"
->Internet Printing Protocol</SPAN
-> 
-and then enter something similar to 'usb:/dev/usblp0' in the next
-screen.  However, this fails later in the configuration process with a
-"client_error_not_possible" error message with no other explanation.
-Note that entering 'file:/dev/usblp0' will not work either. While CUPS
-will allow this, printing will not actually work in some situations.
-   </P
-><P
->CUPS versions 1.1.10 and earlier exhibit similar behavior with regard
-to not displaying the USB printer if it was not connected to the USB
-bus and powered up prior to starting the CUPS software.  However,
-these versions of CUPS will indeed allow the user to enter the name of
-the USB connection, unlike versions 1.1.11 and later.
-   </P
-></TD
-></TR
-></TABLE
-></DIV
-><P
->Select the manufacturer of your printer and click the
-<SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button.  A window will appear which
-asks you to select the specific model number for your printer.
-   </P
-><P
->Scroll through the long list and find the model number for your
-printer.  Notice carefully that there are many different languages
-supported for each printer, as denoted by the initials in parenthesis.
-(en) would be for English, (da) for Danish, (sv) for Swedish, (fr) for
-French, (no) for Norwegian, (pl) for Polish, and (en_GB) for British
-English (see <A
-HREF="x452.html#FIG-CUPS-ADMIN-MODEL"
->Figure 3-6</A
->).  Also take note
-of the Gutenprint revision for the driver, and ensure that it is
-indeed the version of Gutenprint which you have most recently
-installed.  Once you have made the proper selection, click on the
-<SPAN
-CLASS="GUIBUTTON"
->Continue</SPAN
-> button. 
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-ADMIN-MODEL"
-></A
-><P
-><B
->Figure 3-6. The 2nd CUPS Admin Model/Driver Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_model.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="FIGURE"
-><A
-NAME="AEN526"
-></A
-><P
-><B
->Figure 3-7. The CUPS Admin Success Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_admin_success.png"></P
-></DIV
-></DIV
-><P
->Congratulations!  You should now see the CUPS window indicating that
-your printer was successfully installed.  Notice the sentence which
-reads "Printer your_printer has been added successfully".  Click on
-your_printer, which will be the underlined name for your printer.
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-MY-PRINTER"
-></A
-><P
-><B
->Figure 3-8. The CUPS Window for Your Printer</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_my_printer.png"></P
-></DIV
-></DIV
-><P
->After clicking on your_printer (epson_870 in this example), a window
-will appear similar to that shown in <A
-HREF="x452.html#FIG-CUPS-MY-PRINTER"
->Figure 3-8</A
->.
-It would probably be a good idea at this point to click on the
-<SPAN
-CLASS="GUIBUTTON"
->Print Test Page</SPAN
-> button to ensure that
-everything is working properly.  Take note of the Gutenprint revision
-printed on this screen and confirm once again that it is the expected
-revision.
-   </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x544.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->CUPS and Gutenprint</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Configuring your Printer in CUPS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x544.html b/doc/users_guide/html/x544.html
deleted file mode 100644
index 5451344..0000000
--- a/doc/users_guide/html/x544.html
+++ /dev/null
@@ -1,193 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->Configuring your Printer in CUPS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="PREVIOUS"
-TITLE="CUPS Printer Installation"
-HREF="x452.html"><LINK
-REL="NEXT"
-TITLE="Using CUPS from the Command Line"
-HREF="x559.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x452.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. CUPS and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x559.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN544"
->Configuring your Printer in CUPS</A
-></H1
-><P
->With reference to <A
-HREF="x452.html#FIG-CUPS-MY-PRINTER"
->Figure 3-8</A
->, click
-on the <SPAN
-CLASS="GUIBUTTON"
->Configure Printer</SPAN
-> button.  A partial
-screenshot of the printer configuration window appears in
-<A
-HREF="x544.html#FIG-CUPS-PRINTER-CONFIG-WINDOW"
->Figure 3-9</A
->.
-The contents of this window will vary depending on precisely which
-printer you selected when you configured CUPS for your printer.  The
-screenshot shows the selections made by the author for his printer.
-The individual selections will not be explained in detail here, as
-they are the same selections which are available when using the
-Gutenprint plugin to the GIMP.  These selections are explained in
-detail in various sections of the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->GIMP and
-Gutenprint</I
-></SPAN
-> chapter of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->The User's Guide to the
-Gutenprint Top Quality Printer Drivers</I
-></SPAN
->.
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-CUPS-PRINTER-CONFIG-WINDOW"
-></A
-><P
-><B
->Figure 3-9. The CUPS Printer Cofiguration Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/cups_config_printer.png"></P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x452.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x559.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->CUPS Printer Installation</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Using CUPS from the Command Line</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x559.html b/doc/users_guide/html/x559.html
deleted file mode 100644
index 666ec94..0000000
--- a/doc/users_guide/html/x559.html
+++ /dev/null
@@ -1,233 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->Using CUPS from the Command Line</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><LINK
-REL="PREVIOUS"
-TITLE="Configuring your Printer in CUPS"
-HREF="x544.html"><LINK
-REL="NEXT"
-TITLE="Gutenprint Utilities"
-HREF="c568.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x544.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. CUPS and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="c568.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN559"
->Using CUPS from the Command Line</A
-></H1
-><P
->    It is possible to use the CUPS printing system from the command
-line.  While this document will not delve into all of the specifics of
-the CUPS command line interface, there are portions of this interface
-which are specific to the Gutenprint software.
-   </P
-><P
->The command line is in some cases a more convenient way to generate
-printed output (e.g. when printing from a script).  However, most
-people (including the author) cannot easily predict what a command
-line option of "-o stpCyan=1350" will do to the output.  It is
-therefore a good idea to use the GIMP to view the image and the
-Gutenprint plugin to preview these settings before relying on the
-command line.
-   </P
-><P
->When using CUPS from the command line, the command will have this
-general format:
-
-   <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->   
-     lpr -P my_printer_name \
-         -o option1=&#60;choice1&#62; \
-         -o option2=&#60;choice2&#62; \
-         /path/to/printfile
-     
-   </PRE
-></TD
-></TR
-></TABLE
->
-
-When typing the command directly onto the command line, put all of the
-command line options on one line, and do not type the "\" characters.
-The list of possible options which are specific to Gutenprint,
-followed by some of the supported choices, are shown below:
-
-   <TABLE
-BORDER="0"
-BGCOLOR="#E0E0E0"
-WIDTH="100%"
-><TR
-><TD
-><PRE
-CLASS="PROGRAMLISTING"
->   
-   -o PageSize=&#60;...| A3 | A4 | A4 | ...&#62;
-   -o InputSlot=&#60;Roll | Standard&#62;
-   -o MediaType=&#60; ..| Inkjet | Plain | GlossyPaper | ...&#62;
-   -o Resolution=&#60;360sw | 360swuni ...| 1440x720 &#62;
-   -o ColorModel=&#60;Black | RGB | Gray | CMYK&#62;
-   -o stpBrightness=&#60;0...2000&#62;
-   -o stpContrast=&#60;0...2000&#62;
-   -o stpCyan=&#60;0...4000&#62;
-   -o stpDensity=&#60;0...2000&#62;
-   -o stpDither=&#60;0...4000&#62;
-   -o stpGamma=&#60;0...4000&#62;
-   -o stpImageType=&#60;LineArt | Continuous | SolidTone&#62;
-   -o stpInkType=&#60;PhotoCMY | CMYK | PhotoCMYK | RGB&#62;
-   -o stpMagenta=&#60;0...4000&#62;
-   -o stpSaturation=&#60;0...9000&#62;
-   -o stpYellow=&#60;0...4000&#62;
-   
-   </PRE
-></TD
-></TR
-></TABLE
->
-
-For more detailed information, consult the appropriate sections of the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->GIMP and
-Gutenprint</I
-></SPAN
-> chapter of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->The User's Guide to the
-Gutenprint Top Quality Printer Drivers</I
-></SPAN
->.
-   </P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x544.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="c568.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Configuring your Printer in CUPS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Gutenprint Utilities</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x640.html b/doc/users_guide/html/x640.html
deleted file mode 100644
index a54bc9b..0000000
--- a/doc/users_guide/html/x640.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->APPLICABILITY AND DEFINITIONS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="NEXT"
-TITLE="VERBATIM COPYING"
-HREF="x650.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="gfdl.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x650.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN640"
->1. APPLICABILITY AND DEFINITIONS</A
-></H1
-><P
->This License applies to any manual or other work that
-    contains a notice placed by the copyright holder saying it can be
-    distributed under the terms of this License.  The "Document",
-    below, refers to any such manual or work.  Any member of the
-    public is a licensee, and is addressed as "you".</P
-><P
->A "Modified Version" of the Document means any work
-    containing the Document or a portion of it, either copied
-    verbatim, or with modifications and/or translated into another
-    language.</P
-><P
->A "Secondary Section" is a named appendix or a front-matter
-    section of the Document that deals exclusively with the
-    relationship of the publishers or authors of the Document to the
-    Document's overall subject (or to related matters) and contains
-    nothing that could fall directly within that overall subject.
-    (For example, if the Document is in part a textbook of
-    mathematics, a Secondary Section may not explain any mathematics.)
-    The relationship could be a matter of historical connection with
-    the subject or with related matters, or of legal, commercial,
-    philosophical, ethical or political position regarding
-    them.</P
-><P
->The "Invariant Sections" are certain Secondary Sections
-    whose titles are designated, as being those of Invariant Sections,
-    in the notice that says that the Document is released under this
-    License.</P
-><P
->The "Cover Texts" are certain short passages of text that
-    are listed, as Front-Cover Texts or Back-Cover Texts, in the
-    notice that says that the Document is released under this
-    License.</P
-><P
->A "Transparent" copy of the Document means a
-    machine-readable copy, represented in a format whose specification
-    is available to the general public, whose contents can be viewed
-    and edited directly and straightforwardly with generic text
-    editors or (for images composed of pixels) generic paint programs
-    or (for drawings) some widely available drawing editor, and that
-    is suitable for input to text formatters or for automatic
-    translation to a variety of formats suitable for input to text
-    formatters.  A copy made in an otherwise Transparent file format
-    whose markup has been designed to thwart or discourage subsequent
-    modification by readers is not Transparent.  A copy that is not
-    "Transparent" is called "Opaque".</P
-><P
->Examples of suitable formats for Transparent copies include
-    plain ASCII without markup, Texinfo input format, LaTeX input
-    format, SGML or XML using a publicly available DTD, and
-    standard-conforming simple HTML designed for human modification.
-    Opaque formats include PostScript, PDF, proprietary formats that
-    can be read and edited only by proprietary word processors, SGML
-    or XML for which the DTD and/or processing tools are not generally
-    available, and the machine-generated HTML produced by some word
-    processors for output purposes only.</P
-><P
->The "Title Page" means, for a printed book, the title page
-    itself, plus such following pages as are needed to hold, legibly,
-    the material this License requires to appear in the title page.
-    For works in formats which do not have any title page as such,
-    "Title Page" means the text near the most prominent appearance of
-    the work's title, preceding the beginning of the body of the
-    text.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x650.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->GNU Free Documentation License</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->VERBATIM COPYING</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x650.html b/doc/users_guide/html/x650.html
deleted file mode 100644
index 5efd0a3..0000000
--- a/doc/users_guide/html/x650.html
+++ /dev/null
@@ -1,155 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->VERBATIM COPYING</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="APPLICABILITY AND DEFINITIONS"
-HREF="x640.html"><LINK
-REL="NEXT"
-TITLE="COPYING IN QUANTITY"
-HREF="x654.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x640.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x654.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN650"
->2. VERBATIM COPYING</A
-></H1
-><P
->You may copy and distribute the Document in any medium,
-    either commercially or noncommercially, provided that this
-    License, the copyright notices, and the license notice saying this
-    License applies to the Document are reproduced in all copies, and
-    that you add no other conditions whatsoever to those of this
-    License.  You may not use technical measures to obstruct or
-    control the reading or further copying of the copies you make or
-    distribute.  However, you may accept compensation in exchange for
-    copies.  If you distribute a large enough number of copies you
-    must also follow the conditions in section 3.</P
-><P
->You may also lend copies, under the same conditions stated
-    above, and you may publicly display copies.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x640.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x654.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->APPLICABILITY AND DEFINITIONS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->COPYING IN QUANTITY</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x654.html b/doc/users_guide/html/x654.html
deleted file mode 100644
index f6d4ec3..0000000
--- a/doc/users_guide/html/x654.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->COPYING IN QUANTITY</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="VERBATIM COPYING"
-HREF="x650.html"><LINK
-REL="NEXT"
-TITLE="MODIFICATIONS"
-HREF="x660.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x650.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x660.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN654"
->3. COPYING IN QUANTITY</A
-></H1
-><P
->If you publish printed copies of the Document numbering more
-    than 100, and the Document's license notice requires Cover Texts,
-    you must enclose the copies in covers that carry, clearly and
-    legibly, all these Cover Texts: Front-Cover Texts on the front
-    cover, and Back-Cover Texts on the back cover.  Both covers must
-    also clearly and legibly identify you as the publisher of these
-    copies.  The front cover must present the full title with all
-    words of the title equally prominent and visible.  You may add
-    other material on the covers in addition.  Copying with changes
-    limited to the covers, as long as they preserve the title of the
-    Document and satisfy these conditions, can be treated as verbatim
-    copying in other respects.</P
-><P
->If the required texts for either cover are too voluminous to
-    fit legibly, you should put the first ones listed (as many as fit
-    reasonably) on the actual cover, and continue the rest onto
-    adjacent pages.</P
-><P
->If you publish or distribute Opaque copies of the Document
-    numbering more than 100, you must either include a
-    machine-readable Transparent copy along with each Opaque copy, or
-    state in or with each Opaque copy a publicly-accessible
-    computer-network location containing a complete Transparent copy
-    of the Document, free of added material, which the general
-    network-using public has access to download anonymously at no
-    charge using public-standard network protocols.  If you use the
-    latter option, you must take reasonably prudent steps, when you
-    begin distribution of Opaque copies in quantity, to ensure that
-    this Transparent copy will remain thus accessible at the stated
-    location until at least one year after the last time you
-    distribute an Opaque copy (directly or through your agents or
-    retailers) of that edition to the public.</P
-><P
->It is requested, but not required, that you contact the
-    authors of the Document well before redistributing any large
-    number of copies, to give them a chance to provide you with an
-    updated version of the Document.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x650.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x660.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->VERBATIM COPYING</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->MODIFICATIONS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x660.html b/doc/users_guide/html/x660.html
deleted file mode 100644
index 6d98bde..0000000
--- a/doc/users_guide/html/x660.html
+++ /dev/null
@@ -1,285 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->MODIFICATIONS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="COPYING IN QUANTITY"
-HREF="x654.html"><LINK
-REL="NEXT"
-TITLE="COMBINING DOCUMENTS"
-HREF="x696.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x654.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x696.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN660"
->4. MODIFICATIONS</A
-></H1
-><P
->You may copy and distribute a Modified Version of the
-    Document under the conditions of sections 2 and 3 above, provided
-    that you release the Modified Version under precisely this
-    License, with the Modified Version filling the role of the
-    Document, thus licensing distribution and modification of the
-    Modified Version to whoever possesses a copy of it.  In addition,
-    you must do these things in the Modified Version:</P
-><P
-></P
-><OL
-TYPE="A"
-><LI
-><P
->Use in the Title Page
-      (and on the covers, if any) a title distinct from that of the
-      Document, and from those of previous versions (which should, if
-      there were any, be listed in the History section of the
-      Document).  You may use the same title as a previous version if
-      the original publisher of that version gives permission.</P
-></LI
-><LI
-><P
->List on the Title Page,
-      as authors, one or more persons or entities responsible for
-      authorship of the modifications in the Modified Version,
-      together with at least five of the principal authors of the
-      Document (all of its principal authors, if it has less than
-      five).</P
-></LI
-><LI
-><P
->State on the Title page
-      the name of the publisher of the Modified Version, as the
-      publisher.</P
-></LI
-><LI
-><P
->Preserve all the
-      copyright notices of the Document.</P
-></LI
-><LI
-><P
->Add an appropriate
-      copyright notice for your modifications adjacent to the other
-      copyright notices.</P
-></LI
-><LI
-><P
->Include, immediately
-      after the copyright notices, a license notice giving the public
-      permission to use the Modified Version under the terms of this
-      License, in the form shown in the Addendum below.</P
-></LI
-><LI
-><P
->Preserve in that license
-      notice the full lists of Invariant Sections and required Cover
-      Texts given in the Document's license notice.</P
-></LI
-><LI
-><P
->Include an unaltered
-      copy of this License.</P
-></LI
-><LI
-><P
->Preserve the section
-      entitled "History", and its title, and add to it an item stating
-      at least the title, year, new authors, and publisher of the
-      Modified Version as given on the Title Page.  If there is no
-      section entitled "History" in the Document, create one stating
-      the title, year, authors, and publisher of the Document as given
-      on its Title Page, then add an item describing the Modified
-      Version as stated in the previous sentence.</P
-></LI
-><LI
-><P
->Preserve the network
-      location, if any, given in the Document for public access to a
-      Transparent copy of the Document, and likewise the network
-      locations given in the Document for previous versions it was
-      based on.  These may be placed in the "History" section.  You
-      may omit a network location for a work that was published at
-      least four years before the Document itself, or if the original
-      publisher of the version it refers to gives permission.</P
-></LI
-><LI
-><P
->In any section entitled
-      "Acknowledgements" or "Dedications", preserve the section's
-      title, and preserve in the section all the substance and tone of
-      each of the contributor acknowledgements and/or dedications
-      given therein.</P
-></LI
-><LI
-><P
->Preserve all the
-      Invariant Sections of the Document, unaltered in their text and
-      in their titles.  Section numbers or the equivalent are not
-      considered part of the section titles.</P
-></LI
-><LI
-><P
->Delete any section
-      entitled "Endorsements".  Such a section may not be included in
-      the Modified Version.</P
-></LI
-><LI
-><P
->Do not retitle any
-      existing section as "Endorsements" or to conflict in title with
-      any Invariant Section.</P
-></LI
-></OL
-><P
->If the Modified Version includes new front-matter sections
-    or appendices that qualify as Secondary Sections and contain no
-    material copied from the Document, you may at your option
-    designate some or all of these sections as invariant.  To do this,
-    add their titles to the list of Invariant Sections in the Modified
-    Version's license notice.  These titles must be distinct from any
-    other section titles.</P
-><P
->You may add a section entitled "Endorsements", provided it
-    contains nothing but endorsements of your Modified Version by
-    various parties--for example, statements of peer review or that
-    the text has been approved by an organization as the authoritative
-    definition of a standard.</P
-><P
->You may add a passage of up to five words as a Front-Cover
-    Text, and a passage of up to 25 words as a Back-Cover Text, to the
-    end of the list of Cover Texts in the Modified Version.  Only one
-    passage of Front-Cover Text and one of Back-Cover Text may be
-    added by (or through arrangements made by) any one entity.  If the
-    Document already includes a cover text for the same cover,
-    previously added by you or by arrangement made by the same entity
-    you are acting on behalf of, you may not add another; but you may
-    replace the old one, on explicit permission from the previous
-    publisher that added the old one.</P
-><P
->The author(s) and publisher(s) of the Document do not by
-    this License give permission to use their names for publicity for
-    or to assert or imply endorsement of any Modified Version.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x654.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x696.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->COPYING IN QUANTITY</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->COMBINING DOCUMENTS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x696.html b/doc/users_guide/html/x696.html
deleted file mode 100644
index a386997..0000000
--- a/doc/users_guide/html/x696.html
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->COMBINING DOCUMENTS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="MODIFICATIONS"
-HREF="x660.html"><LINK
-REL="NEXT"
-TITLE="COLLECTIONS OF DOCUMENTS"
-HREF="x701.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x660.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x701.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN696"
->5. COMBINING DOCUMENTS</A
-></H1
-><P
->You may combine the Document with other documents released
-    under this License, under the terms defined in section 4 above for
-    modified versions, provided that you include in the combination
-    all of the Invariant Sections of all of the original documents,
-    unmodified, and list them all as Invariant Sections of your
-    combined work in its license notice.</P
-><P
->The combined work need only contain one copy of this
-    License, and multiple identical Invariant Sections may be replaced
-    with a single copy.  If there are multiple Invariant Sections with
-    the same name but different contents, make the title of each such
-    section unique by adding at the end of it, in parentheses, the
-    name of the original author or publisher of that section if known,
-    or else a unique number.  Make the same adjustment to the section
-    titles in the list of Invariant Sections in the license notice of
-    the combined work.</P
-><P
->In the combination, you must combine any sections entitled
-    "History" in the various original documents, forming one section
-    entitled "History"; likewise combine any sections entitled
-    "Acknowledgements", and any sections entitled "Dedications".  You
-    must delete all sections entitled "Endorsements."</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x660.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x701.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->MODIFICATIONS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->COLLECTIONS OF DOCUMENTS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x701.html b/doc/users_guide/html/x701.html
deleted file mode 100644
index 8ec3b53..0000000
--- a/doc/users_guide/html/x701.html
+++ /dev/null
@@ -1,154 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->COLLECTIONS OF DOCUMENTS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="COMBINING DOCUMENTS"
-HREF="x696.html"><LINK
-REL="NEXT"
-TITLE="AGGREGATION WITH INDEPENDENT WORKS"
-HREF="x705.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x696.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x705.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN701"
->6. COLLECTIONS OF DOCUMENTS</A
-></H1
-><P
->You may make a collection consisting of the Document and
-    other documents released under this License, and replace the
-    individual copies of this License in the various documents with a
-    single copy that is included in the collection, provided that you
-    follow the rules of this License for verbatim copying of each of
-    the documents in all other respects.</P
-><P
->You may extract a single document from such a collection,
-    and distribute it individually under this License, provided you
-    insert a copy of this License into the extracted document, and
-    follow this License in all other respects regarding verbatim
-    copying of that document.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x696.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x705.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->COMBINING DOCUMENTS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->AGGREGATION WITH INDEPENDENT WORKS</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x705.html b/doc/users_guide/html/x705.html
deleted file mode 100644
index 20194cc..0000000
--- a/doc/users_guide/html/x705.html
+++ /dev/null
@@ -1,158 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->AGGREGATION WITH INDEPENDENT WORKS</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="COLLECTIONS OF DOCUMENTS"
-HREF="x701.html"><LINK
-REL="NEXT"
-TITLE="TRANSLATION"
-HREF="x709.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x701.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x709.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN705"
->7. AGGREGATION WITH INDEPENDENT WORKS</A
-></H1
-><P
->A compilation of the Document or its derivatives with other
-    separate and independent documents or works, in or on a volume of
-    a storage or distribution medium, does not as a whole count as a
-    Modified Version of the Document, provided no compilation
-    copyright is claimed for the compilation.  Such a compilation is
-    called an "aggregate", and this License does not apply to the
-    other self-contained works thus compiled with the Document, on
-    account of their being thus compiled, if they are not themselves
-    derivative works of the Document.</P
-><P
->If the Cover Text requirement of section 3 is applicable to
-    these copies of the Document, then if the Document is less than
-    one quarter of the entire aggregate, the Document's Cover Texts
-    may be placed on covers that surround only the Document within the
-    aggregate.  Otherwise they must appear on covers around the whole
-    aggregate.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x701.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x709.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->COLLECTIONS OF DOCUMENTS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->TRANSLATION</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x709.html b/doc/users_guide/html/x709.html
deleted file mode 100644
index 79aa45e..0000000
--- a/doc/users_guide/html/x709.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->TRANSLATION</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="AGGREGATION WITH INDEPENDENT WORKS"
-HREF="x705.html"><LINK
-REL="NEXT"
-TITLE="TERMINATION"
-HREF="x712.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x705.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x712.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN709"
->8. TRANSLATION</A
-></H1
-><P
->Translation is considered a kind of modification, so you may
-    distribute translations of the Document under the terms of section
-    4.  Replacing Invariant Sections with translations requires
-    special permission from their copyright holders, but you may
-    include translations of some or all Invariant Sections in addition
-    to the original versions of these Invariant Sections.  You may
-    include a translation of this License provided that you also
-    include the original English version of this License.  In case of
-    a disagreement between the translation and the original English
-    version of this License, the original English version will
-    prevail.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x705.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x712.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->AGGREGATION WITH INDEPENDENT WORKS</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->TERMINATION</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x712.html b/doc/users_guide/html/x712.html
deleted file mode 100644
index c608ba6..0000000
--- a/doc/users_guide/html/x712.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->TERMINATION</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="TRANSLATION"
-HREF="x709.html"><LINK
-REL="NEXT"
-TITLE="FUTURE REVISIONS OF THIS LICENSE"
-HREF="x715.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x709.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x715.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN712"
->9. TERMINATION</A
-></H1
-><P
->You may not copy, modify, sublicense, or distribute the
-    Document except as expressly provided for under this License.  Any
-    other attempt to copy, modify, sublicense or distribute the
-    Document is void, and will automatically terminate your rights
-    under this License.  However, parties who have received copies, or
-    rights, from you under this License will not have their licenses
-    terminated so long as such parties remain in full
-    compliance.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x709.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x715.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->TRANSLATION</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->FUTURE REVISIONS OF THIS LICENSE</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x715.html b/doc/users_guide/html/x715.html
deleted file mode 100644
index dd65de3..0000000
--- a/doc/users_guide/html/x715.html
+++ /dev/null
@@ -1,161 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->FUTURE REVISIONS OF THIS LICENSE</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="TERMINATION"
-HREF="x712.html"><LINK
-REL="NEXT"
-TITLE="How to use this License for your documents"
-HREF="x720.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x712.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="x720.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN715"
->10. FUTURE REVISIONS OF THIS LICENSE</A
-></H1
-><P
->The Free Software Foundation may publish new, revised
-    versions of the GNU Free Documentation License from time to time.
-    Such new versions will be similar in spirit to the present
-    version, but may differ in detail to address new problems or
-    concerns.  See <A
-HREF="http://www.gnu.org/copyleft/"
-TARGET="_top"
->http://www.gnu.org/copyleft/</A
->.</P
-><P
->Each version of the License is given a distinguishing
-    version number.  If the Document specifies that a particular
-    numbered version of this License "or any later version" applies to
-    it, you have the option of following the terms and conditions
-    either of that specified version or of any later version that has
-    been published (not as a draft) by the Free Software Foundation.
-    If the Document does not specify a version number of this License,
-    you may choose any version ever published (not as a draft) by the
-    Free Software Foundation.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x712.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="x720.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->TERMINATION</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->How to use this License for your documents</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x720.html b/doc/users_guide/html/x720.html
deleted file mode 100644
index c583d14..0000000
--- a/doc/users_guide/html/x720.html
+++ /dev/null
@@ -1,160 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->How to use this License for your documents</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GNU Free Documentation License"
-HREF="gfdl.html"><LINK
-REL="PREVIOUS"
-TITLE="FUTURE REVISIONS OF THIS LICENSE"
-HREF="x715.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="x715.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Appendix A. GNU Free Documentation License</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
->&nbsp;</TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN720"
->How to use this License for your documents</A
-></H1
-><P
->To use this License in a document you have written, include
-    a copy of the License in the document and put the following
-    copyright and license notices just after the title page:</P
-><A
-NAME="AEN723"
-></A
-><BLOCKQUOTE
-CLASS="BLOCKQUOTE"
-><P
->      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".</P
-></BLOCKQUOTE
-><P
->If you have no Invariant Sections, write "with no Invariant
-    Sections" instead of saying which ones are invariant.  If you have
-    no Front-Cover Texts, write "no Front-Cover Texts" instead of
-    "Front-Cover Texts being LIST"; likewise for Back-Cover
-    Texts.</P
-><P
->If your document contains nontrivial examples of program
-    code, we recommend releasing these examples in parallel under your
-    choice of free software license, such as the GNU General Public
-    License, to permit their use in free software.</P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="x715.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->FUTURE REVISIONS OF THIS LICENSE</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="gfdl.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->&nbsp;</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/html/x85.html b/doc/users_guide/html/x85.html
deleted file mode 100644
index d1a2eb8..0000000
--- a/doc/users_guide/html/x85.html
+++ /dev/null
@@ -1,1762 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<HTML
-><HEAD
-><TITLE
->The Gimp-Print Graphical User Interface</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.7"><LINK
-REL="HOME"
-TITLE="The User's Guide to Gutenprint - Complete Edition"
-HREF="book1.html"><LINK
-REL="UP"
-TITLE="GIMP and Gutenprint"
-HREF="ch-gimp-and-gimp-print.html"><LINK
-REL="PREVIOUS"
-TITLE="GIMP and Gutenprint"
-HREF="ch-gimp-and-gimp-print.html"><LINK
-REL="NEXT"
-TITLE="CUPS and Gutenprint"
-HREF="c443.html"><META
-http-equiv="Content-Type"
-content="text/html; charset="></HEAD
-><BODY
-CLASS="SECT1"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->The User's Guide to Gutenprint - Complete Edition</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 2. GIMP and Gutenprint</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="c443.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="AEN85"
->The Gimp-Print Graphical User Interface</A
-></H1
-><P
->   Now that the GIMP is displaying your picture, put your mouse over
-the picture and click the right mouse button. A menu will appear.
-Choose the
-    <SPAN
-CLASS="GUIMENU"
->File</SPAN
->-&gt;<SPAN
-CLASS="GUIMENUITEM"
->Print</SPAN
->
-menu option. This will cause the Gimp-Print GUI window to appear (see
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->Figure 2-3</A
->). Move the mouse cursor
-over the various parts of the Gimp-Print GUI window, and notice that
-if you leave your mouse in one place for a short time without clicking
-any buttons, a small box appears.  This box contains helpful text.
-These small boxes are called "tooltips" and are intended to remind you
-about the function of each part of the graphical interface.
-    </P
-><P
->The next several sections will continuously refer to
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->Figure 2-3</A
-> and
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
->Figure 2-4</A
->.  The difference between
-the two figures can be seen in the top right corner of the window.
-Notice that there are two tabs, one which reads
-<SPAN
-CLASS="GUILABEL"
->Printer Settings</SPAN
-> and another which reads
-<SPAN
-CLASS="GUILABEL"
->Image/Output Settings</SPAN
->.  Notice also that the
-window is divided into several major sections which directly map to
-the major sections of this document:
-  <P
-></P
-><UL
-><LI
-><P
-><A
-HREF="x85.html#AEN230"
->Preview</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN130"
->Printer Settings</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN130"
->Image/Output Settings</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN254"
->Position</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN326"
->Size</A
-></P
-></LI
-><LI
-><P
-><A
-HREF="x85.html#AEN426"
->Printing and Saving Settings</A
-></P
-></LI
-></UL
->
-  </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-GIMP-PRINT-GUI"
-></A
-><P
-><B
->Figure 2-3. The Gimp-Print Graphical User Interface 1 (GUI)</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-gui.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-GIMP-PRINT-GUI-1"
-></A
-><P
-><B
->Figure 2-4. The Gimp-Print Graphical User Interface 2 (GUI)</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-gui-1.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN130"
->Printer Settings</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN134"
->Printer</A
-></H3
-><P
->      Click on the <SPAN
-CLASS="GUILABEL"
->Printer Settings</SPAN
-> tab near the
-top right hand corner of the window (see
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI"
->Figure 2-3</A
->).  Then, click on the downward
-facing arrow to the right of the <SPAN
-CLASS="GUILABEL"
->Printer</SPAN
-> combo
-box to see a list of the system printer queues.  Select the queue to which
-you would like the printed image to be sent.  One may also print the
-image directly to a file by selecting <SPAN
-CLASS="GUIMENUITEM"
->File</SPAN
->.
-In this event, the user will be prompted for the filename when either the
-<SPAN
-CLASS="GUIBUTTON"
->Print</SPAN
-> button or the <SPAN
-CLASS="GUIBUTTON"
->Print and Save
-Settings</SPAN
-> button is clicked.
-     </P
-><P
->When either the <SPAN
-CLASS="GUIBUTTON"
->Print and Save Settings</SPAN
-> button
-or the <SPAN
-CLASS="GUIBUTTON"
->Save Settings</SPAN
-> button is clicked,
-the settings are saved in a file called
-<TT
-CLASS="FILENAME"
->~/.gimp-1.2/printrc</TT
->.  The user is cautioned about
-hand editing this file since it is generated by Gutenprint (although
-it was the only way that the author found for removing bogus entries
-created while playing with the <SPAN
-CLASS="GUIBUTTON"
->New Printer</SPAN
-> button).
-    </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN148"
->Setup Printer</A
-></H3
-><P
->     Before any useful printing can occur, the user needs to associate
-the named printer with the
-actual make and model of the printer.  Click the
-<SPAN
-CLASS="GUIBUTTON"
->Setup Printer</SPAN
-> button in
-the <SPAN
-CLASS="GUILABEL"
->Printer</SPAN
-> section of the window (the upper
-right, and just below the Printer display box). When this is done, the
-following window appears:
-
-   <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN153"
-></A
-><P
-><B
->Figure 2-5. The Setup Printer Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-setup.png"></P
-></DIV
-></DIV
->
-    </P
-><P
->     Scroll through the Printer Model section of the window until you
-find a printer which matches yours. If you cannot find the precise
-model, pick something close and hope for the best.  There are selections
-for a wide array of Postscript, inkjet, and laser printers.  After you
-have selected a printer, you will see the printer command displayed.
-    </P
-><P
->The Gutenprint software does all of the necessary conversion of the
-image to be printed into the language of your printer. It is
-unnecessary and undesirable for any other sofware to manipulate this
-data.  (This is why the command contains the "-l" switch or the "-o
-raw" switch).  Please use care if you feel the need to edit this
-command.  Once you are satisfied with your selection, click the
-<SPAN
-CLASS="GUIBUTTON"
->OK</SPAN
-> button.
-    </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN163"
->New Printer</A
-></H3
-><P
->     In the previous sections, the user selected an existing printer
-queue and associated a particular type of printer to that queue.  For
-most cases, this is probably all that is required.  However, some
-situations might require more detailed control over the handling of
-the printer data.
-     </P
-><P
->     Click the <SPAN
-CLASS="GUIBUTTON"
->New Printer</SPAN
-> button to tell the
-software that you wish to create a new name.  In this case, the new
-name may actually be an existing printer with different settings that
-you wish to save, or it may simply be a name associated with a
-particular command for handling the printer data.  A window will
-appear thus:
-
-   <DIV
-CLASS="FIGURE"
-><A
-NAME="AEN168"
-></A
-><P
-><B
->Figure 2-6. The New Printer Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-new-printer.png"></P
-></DIV
-></DIV
->
-
-    Type a name into the window and click <SPAN
-CLASS="GUIBUTTON"
->OK</SPAN
->
-(or <SPAN
-CLASS="GUIBUTTON"
->Cancel</SPAN
-> if you wish not to do this).
-Notice that the new name now appears as the selected <SPAN
-CLASS="GUILABEL"
->Printer</SPAN
->.
-As you change settings in the rest of the Gimp-Print GUI, they will be
-associated with this printer name.  When the settings are saved,
-they can be recovered easily by simply selecting this named printer
-from the Printer combo box.
-    </P
-><P
->    One example where this feature might be used is as follows.  The
-author frequently prints photos on Epson 4x6 photo paper.  Note that
-this paper is physically larger than 4x6 and it has perforations on
-all four sides.  The author dislikes printing part of the image on the
-perforated parts of the paper which will be removed after
-printing the photo.  By selecting the proper scaling percentage,
-printing can be constrained to the 4x6 part of the paper which will
-remain after the perforated sections are removed.  The author has
-saved this setting using this feature of the Gutenprint software.
-    </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN179"
->Media Size</A
-></H3
-><P
->     The term <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->media</I
-></SPAN
-> refers to paper, card stock,
-envelopes, or whatever you have put into your printer onto which
-something will be printed.  Click the arrow to the right of the
-<SPAN
-CLASS="GUILABEL"
->Media Size</SPAN
-> box to see a long list of different
-sizes of media.  Choose the size that matches the media which you have
-loaded into your printer.  Once you have made your choice, the drop
-down menu will disappear, and your choice will be shown in the
-<SPAN
-CLASS="GUILABEL"
->Media Size</SPAN
-> box.  The available paper sizes will
-vary depending upon the printer model you have selected.
-   </P
-><P
->   Some printers support arbitrary (within limits!) paper sizes.
-   These printers will let you select <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Custom</I
-></SPAN
->
-   or <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Roll</I
-></SPAN
-> paper sizes.  When you select such a
-   printer, one or both of the <SPAN
-CLASS="GUILABEL"
->Dimensions</SPAN
-> boxes
-   will let you enter your paper size (in inches or centimetres).  The
-   boxes will not let you enter sizes that your printer cannot handle.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN189"
->Media Type</A
-></H3
-><P
->     The type of media onto which your image will be printed should be
-selected here.  Click on the arrow to the right of the <SPAN
-CLASS="GUILABEL"
->Media
-Type</SPAN
-> box to see a long list of the different types of media
-onto which you may print your image.  Media types include such things
-as plain paper, postcards, photo quality paper, transparencies, and
-more!  Once you have made your choice, the drop down menu will
-disappear, and your choice will be shown in the <SPAN
-CLASS="GUILABEL"
->Media
-Type</SPAN
-> box.  The choices available will vary depending upon
-the printer model you have selected.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN194"
->Media Source</A
-></H3
-><P
->     The <SPAN
-CLASS="GUILABEL"
->Media Source</SPAN
-> box allows the user to
-  choose the paper source, sometimes called <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->Input
-  Slot</I
-></SPAN
->, that the paper will be fed from.  Many printers
-  only have one available input source (such as the standard paper
-  tray), in which case this entry will be grayed out.  If your printer
-  does support multiple input sources, you may specify the source of
-  your choice here.  Some Epson printers offer a roll feed option in
-  addition to the standard paper tray, and many HP LaserJet printers
-  have multiple paper trays.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN199"
->Ink Type</A
-></H3
-><P
->   Some printers offer a choice of different types of ink or ink
-   cartridges.  Many Canon and Lexmark printers support various
-   combinations of cartridges, such as black only, black and color,
-   photo color, and so forth.  Most Epson printers let you choose
-   between three and four color printing (three color uses only color
-   ink, while four color uses black ink as well).  Epson printers that
-   support six color photo printing allow you to choose five and six
-   color printing as well.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN202"
->Resolution</A
-></H3
-><P
->     Click on the arrow to the right of the
-<SPAN
-CLASS="GUILABEL"
->Resolution</SPAN
-> box to see a long list of resolutions
-at which you can print your image.  The list is written with the
-lowest resolution at the top, with increasing resolution (and
-generally improved printing quality) as you approach the bottom of the
-list.  Different printers support different resolution options, and
-many printers support different quality choices using the same basic
-resolution.  In this menu are a few terms which may be unfamiliar to
-you, and they will now be explained.
-   </P
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN206"
->DPI</A
-></H4
-><P
->         DPI is an acronym which stands for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->D</I
-></SPAN
->ots
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->P</I
-></SPAN
->er <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->I</I
-></SPAN
->nch.  This term refers
-to the number of dots that your printer will print in a space of one
-inch (approximately 2.54 cm).  This is highly dependent upon the
-capability of your printer.  Resolutions below 300 DPI are
-used for draft quality.  For general purpose printing, select
-300 - 360 DPI.  Higher quality printing can be achieved by
-selecting 600 - 720 DPI.  Settings higher than this are used for the
-highest possible quality for printing photographs and other high
-quality graphics.  Experiment with your printer and these settings
-with different types of graphics and photographs to see what
-results you can obtain with your printer.  High resolutions (large
-numbers of dots per inch) require substantial image processing time,
-and the print files can be very large; it's not uncommon for a full
-page, 1440x720 DPI image to require 100 MB of temporary storage!
-       </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN212"
->Draft or Fast Economy Draft</A
-></H4
-><P
->     When this text appears next to the resolution, it refers to the
-fact that the quality will be relatively low, but suitable for rough
-drafts.  Draft quality is higher than fast economy draft.  These
-options will give you the fastest printing speed.  Economy Draft uses
-less ink, and as a result the image will be pale.  These modes are
-generally not very useful for printing photographs.
-     </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN215"
->Unidirectional</A
-></H4
-><P
->         When printing an image, you have probably noticed the print
-head inside the printer moving back and forth across the print media.
-Many printers are capable of putting ink on the page regardless of
-which direction the print head is moving.  However, quality can
-sometimes be improved by only putting ink on the page when the printer
-head is moving in one direction.  The
-<SPAN
-CLASS="GUIMENUITEM"
->Unidirectional</SPAN
-> setting instructs the
-software to only place ink on the page when the print head is moving
-one way.  When the print head returns, it will not place ink on the
-page.  On many printers, the print quality is better, at the expense
-of printing speed.
-       </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN219"
->High(est) Quality</A
-></H4
-><P
->         With lower quality print modes, one may see an effect where
-the printed image looks like it has rows of stripes with a small
-separation between the stripes.  This effect is called "banding" and
-is undesirable.  In the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->high</I
-></SPAN
-> and
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->highest</I
-></SPAN
-> quality modes, the printer will make more
-passes over the same part of the page in order to improve quality and
-(reduce or) eliminate banding.  This requires more temporary disk
-space and prints more slowly, but does not require significantly more
-processing time.
-       </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN224"
->DMT</A
-></H4
-><P
->       DMT is an acronym which stands for <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->D</I
-></SPAN
->ot
-       <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->M</I
-></SPAN
->odulation
-       <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->T</I
-></SPAN
->echnology.
-       This term refers to a print mode used by certain Canon printers
-       to improve the quality of the printed output.  Unfortunately,
-       at this time,  all of the available DMT modes do not work
-       correctly.  The cases which do work correctly will offer
-       significantly improved printing quality. 
-       </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN230"
->Preview</A
-></H2
-><P
->   Notice in the upper left of the window is a preview of your image.
-This preview is a representation of where your picture will print on
-the selected media, and approximately what it will look like.  This
-preview will be updated as you modify selections in the
-<SPAN
-CLASS="GUILABEL"
->Position</SPAN
->, <SPAN
-CLASS="GUILABEL"
->Size</SPAN
->,
-<SPAN
-CLASS="GUILABEL"
->Media Size</SPAN
->, and <SPAN
-CLASS="GUILABEL"
->Output Type</SPAN
->
-portions of the window. You may also select the image with your mouse
-and move it manually if you wish. In doing so, you will note that the
-<SPAN
-CLASS="GUILABEL"
->Position</SPAN
-> settings are updated accordingly.  Take
-note of the arrow, which points toward the top of the media, where top
-is the first part of the media to enter the printer.
-  </P
-><P
->  The preview may be moved around the page as follows:
-  </P
-><P
-></P
-><UL
-><LI
-><P
-> Clicking and dragging the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->left</I
-></SPAN
->
-  (primary) mouse button moves the image around the page as you would
-  expect; the image moves with the mouse.  </P
-></LI
-><LI
-><P
-> Clicking and dragging the
-  <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->middle</I
-></SPAN
-> mouse button moves the image around the
-  page in a finer fashion, such that each pixel of mouse movement
-  moves the image by one point (1/72 inch).  This allows very fine
-  placement of the image on the page.  </P
-></LI
-><LI
-><P
-> Clicking and dragging the
-  <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->right</I
-></SPAN
-> (secondary) mouse button moves the image
-  around the page much the same as with the left button, but the image
-  will only move in units of the image size.  Thus, if the image is
-  one inch wide and two inches tall, the image will not move at all
-  until you have moved the mouse far enough so that the image would be
-  moved one inch vertically and two inches horizontally.  This is
-  handy if you wish to print multiple images of the same size on one
-  piece of paper.</P
-></LI
-><LI
-><P
-> If you hold down the <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->shift</I
-></SPAN
-> key
-  on the keyboard when you click and drag the mouse, the image will
-  only move in the horizontal or vertical direction (depending upon
-  which way you first move the mouse).  This allows you to constrain
-  motion to the horizontal or vertical. </P
-></LI
-><LI
-><P
-> If you click another button while dragging the
-  mouse, the image will immediately return to the position it was in
-  before you clicked the mouse the first time.  This allows you to
-  not move the image if you have started moving it and have decided
-  that you don't want to move it.  The preview will not respond to the
-  mouse until you release all of the mouse buttons and click and drag
-  afresh. </P
-></LI
-></UL
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN254"
->Position</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN256"
->Orientation</A
-></H3
-><P
->      The Orientation menu allows the user to choose the orientation
-of the paper.  The menu selections are
-<SPAN
-CLASS="GUIMENUITEM"
->Auto</SPAN
->, <SPAN
-CLASS="GUIMENUITEM"
->Portrait</SPAN
->,
-<SPAN
-CLASS="GUIMENUITEM"
->Landscape</SPAN
->, <SPAN
-CLASS="GUIMENUITEM"
->Upside
-down</SPAN
->, and <SPAN
-CLASS="GUIMENUITEM"
->Seascape</SPAN
->.  Click on
-the rectangular tab to see these choices
-and make your selection.  When you have done so, the pulldown menu
-will have disappeared, and your choice will appear.  Also, note that
-the preview image will have changed accordingly.
-   </P
-><P
->     When set to <SPAN
-CLASS="GUIMENUITEM"
->Auto</SPAN
->, the software will make an
-intelligent choice of orientation based on the dimensions of the image
-to be printed.   <SPAN
-CLASS="GUIMENUITEM"
->Portrait</SPAN
-> orients the print media
-with the longest edge going from top to bottom, while
-<SPAN
-CLASS="GUIMENUITEM"
->Landscape</SPAN
-> orients the paper with the longest edge
-going from side to side.  <SPAN
-CLASS="GUIMENUITEM"
->Upside down</SPAN
-> and
-<SPAN
-CLASS="GUIMENUITEM"
->Seascape</SPAN
-> orient the paper the same as
-<SPAN
-CLASS="GUIMENUITEM"
->Portrait</SPAN
-> and  <SPAN
-CLASS="GUIMENUITEM"
->Landscape</SPAN
->
-respectively, with the difference being that the image is rotated 180 degrees.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN272"
->Automatic Centering</A
-></H3
-><P
->      There are three buttons that deal with centering an image.  The
-leftmost button is the <SPAN
-CLASS="GUIBUTTON"
->Vertically</SPAN
-> button, the
-middle button is the <SPAN
-CLASS="GUIBUTTON"
->Both</SPAN
-> button, and
-the rightmost button is the <SPAN
-CLASS="GUIBUTTON"
->Horizontally</SPAN
->
-button.  Use the <SPAN
-CLASS="GUIBUTTON"
->Both</SPAN
-> button to center your
-image both horizontally and vertically.  This will cause the top and
-bottom borders to be equal, and the left and right borders to be
-equal.  If you have placed your image manually by using the mouse
-button, then you may center the image in the horizontal direction only
-by clicking on the <SPAN
-CLASS="GUIBUTTON"
->Horizontally</SPAN
-> button.
-Likewise, to adjust the image only in the vertical direction, click on
-the <SPAN
-CLASS="GUIBUTTON"
->Vertically</SPAN
-> button.  Note that in
-each case, the image is centered with regard to the edges of the
-media, and without regard to the printable portion of the media.  Many
-printers are incapable of printing to each edge of the media.  Some
-media may have edges which detach.  Consult your printer documentation
-for more details regarding your printer's capabilities in this regard.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN281"
->Manual Settings</A
-></H3
-><P
->      You will notice that there are six boxes that contain numbers
-just below the Orientation menu and just above the GUI buttons related
-to centering an image.  When you move the preview image manually with
-the mouse, or when you click on one of the centering buttons, the
-preview image moves and these six boxes get updated.
-   </P
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN284"
->Left</A
-></H4
-><P
->     The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Left</SPAN
-> box denotes
-the number of units (cm or inches) that the left side of the image
-will be printed away from the left edge of the media.  You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the  <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
-   </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN291"
->Right</A
-></H4
-><P
->     The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Right</SPAN
-> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the left edge of the media.  You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the  <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
-   </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN298"
->Right Border</A
-></H4
-><P
->     The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Right Border</SPAN
-> box denotes
-the number of units (cm or inches) that the right side of the image
-will be printed away from the right edge of the media.  You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the  <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
-   </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN305"
->Top</A
-></H4
-><P
->     The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Top</SPAN
-> box denotes
-the number of units (cm or inches) that the top side of the image
-will be printed away from the top edge of the media.  You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the  <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
-   </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN312"
->Bottom</A
-></H4
-><P
->     The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Bottom</SPAN
-> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the top edge of the media.  You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the  <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
-   </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN319"
->Bottom Border</A
-></H4
-><P
->     The number appearing in the <SPAN
-CLASS="GUIMENUITEM"
->Bottom Border</SPAN
-> box denotes
-the number of units (cm or inches) that the bottom side of the image
-will be printed away from the bottom edge of the media.  You may select
-the units by clicking the <SPAN
-CLASS="GUIBUTTON"
->Inch</SPAN
-> or
-<SPAN
-CLASS="GUIBUTTON"
->cm</SPAN
-> buttons in the  <SPAN
-CLASS="GUILABEL"
->Units</SPAN
-> section just below
-these GUI boxes.
-   </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN326"
->Size</A
-></H2
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN328"
->Slider Bar and Spin Box</A
-></H3
-><P
->      The slider bar can be moved as desired by the user.  Notice
-that while sliding this bar, the preview image changes accordingly.
-One will also note that several boxes in the Gimp-Print GUI change values when this bar is moved.
-These boxes are the six position boxes (left, right, right border,
-top, bottom, bottom border), the two size boxes (width and height),
-and the spin box to the right of the slider bar.
-   </P
-><P
->   This slider bar is used to scale the image to a desirable size, but the same effect can
-be obtained by either clicking an arrow on the spin box to the right of this
-slider bar, or by manually typing a number into this spin box.  Notice
-that by setting the spin box in this way, the slider bar is also
-moved.  All of the described methods will cause the image to be
-scaled accordingly.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN332"
->Scale by Percent or PPI</A
-></H3
-><P
->       One may choose to scale the image by a percentage, or by PPI,
-which means "<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p</I
-></SPAN
->ixels <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->p</I
-></SPAN
->er
-<SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->i</I
-></SPAN
->nch".  Click the radio button
-next to the word to set the desired scaling factor.
-   </P
-><P
->     When scaling by a percentage, the number reflected in the spin
-box next to the slider bar represents the percentage relative
-to the full size of the selected print medium.  For example, with this spin box
-set to 50, the image will be scaled to 50% of the size of the print
-medium.  When set to 100, the image will attempt to fill the print
-medium, within the constraints of maintaining the proper aspect ratio
-and the margins of the selected print medium.  This effect can be seen
-in the preview window.
-   </P
-><P
->     When scaling by PPI, the number reflected in the spin box next to
-the slider bar represents the number of pixels that will be
-printed per inch.  For example, if the user is printing a 640x480
-image at a size of 6.4x4.8 inches (as measured by the size boxes), the
-image will be printed at 100 DPI.
-   </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN340"
->Use Original Image Size</A
-></H3
-><P
->       By clicking this button, the image will be scaled to as close
-to the native size of the image as possible.  This effect can
-immediately be seen in the preview image.
-     </P
-><P
->     The native image size may be found or set in the GIMP by
-     selecting <SPAN
-CLASS="GUIMENUITEM"
->Image/Scale Image</SPAN
-> in the
-     GIMP.  Under the <SPAN
-CLASS="GUILABEL"
->Print Size and Display Unit</SPAN
->
-     group in the <SPAN
-CLASS="GUILABEL"
->Scale Image</SPAN
-> dialog, you can
-     determine (or change) the width and height of the image, or
-     choose the resolution.
-     </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN347"
->Width and Height</A
-></H3
-><P
->       These boxes show the size of the printed image in either inches
-or centimeters (depending on which unit is selected).  The user may
-choose to manually modify these values.  When one value is modified,
-the other value is automatically modified in order to maintain the
-aspect ratio (the ratio of width to height).  This effect can be
-immediately seen in the preview image.
-     </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN350"
->Units</A
-></H3
-><P
->      The units can be set to inches or centimeters by clicking the appropriate
-radio button next to the desired unit.  This setting effects the
-values printed in the six position boxes (left, right, right border,
-top, bottom, bottom border) and the two size boxes (width and height).
-   </P
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN353"
->Image/Output Settings</A
-></H2
-><P
->   By clicking on the tab labeled <SPAN
-CLASS="GUILABEL"
->Image/Output
-Settings</SPAN
->, the Gimp-Print window will appear as shown in
-<A
-HREF="x85.html#FIG-GIMP-PRINT-GUI-1"
->Figure 2-4</A
->.  Notice that there are
-two sections to this portion of the window, namely,
-<SPAN
-CLASS="GUILABEL"
->Image Type</SPAN
-> and
-<SPAN
-CLASS="GUILABEL"
->Output Type</SPAN
->.
-
-   </P
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN360"
->Image Type</A
-></H3
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN362"
->Line Art</A
-></H4
-><P
->      This setting tells the printer driver to generate color
-quickly.  The color is bold and bright, but color accuracy is not very
-good.  There may also be some unexpectedly sharp transitions in
-colors.  This mode is acceptable for printing text with small amounts
-of color, and may be acceptable for presentation graphics.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN365"
->Solid Colors</A
-></H4
-><P
->      This mode produces color which is considerably more accurate
-than the <SPAN
-CLASS="GUILABEL"
->Line Art</SPAN
-> mode, but with a reduction in performance.  In
-general, hues will be accurate but tonalities may not be accurate.
-There should be no sharp transitions in colors.  This mode is good for
-printing presentation graphics in most cases.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN369"
->Photograph</A
-></H4
-><P
->      This mode produces the most accurate colors and tonalities at a
-greater cost in performance.  This is the mode to use when printing
-high quality photographs or other high quality images.
-    </P
-></DIV
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN372"
->Output Type</A
-></H3
-><P
->      The user is given the choice of color, black and white, and
-grayscale.  Color is selected when the desired output is to be in
-color.  Greyscale will result in the printed image having various
-shades of grey.  Black and white is just that.  The effect of this
-setting can be seen in the preview window.
-    </P
-></DIV
-><DIV
-CLASS="SECT3"
-><H3
-CLASS="SECT3"
-><A
-NAME="AEN375"
->Adjust Output</A
-></H3
-><P
->      Clicking on this button causes the <SPAN
-CLASS="GUILABEL"
->Print Color Adjust</SPAN
-> window to
-appear (see <A
-HREF="x85.html#FIG-GIMP-PRINT-COLOR-ADJUST"
->Figure 2-7</A
->).  In
-this window, one will see a representation of the image to be printed
-as well as several slider bars.  These slider bars collectively adjust
-many different aspects of the image.  The values can also be adjusted
-by clicking the arrows or by typing a value into the appropriate spin
-box on the right side of each slider bar.
-   </P
-><DIV
-CLASS="FIGURE"
-><A
-NAME="FIG-GIMP-PRINT-COLOR-ADJUST"
-></A
-><P
-><B
->Figure 2-7. The Print Color Adjust Window</B
-></P
-><DIV
-CLASS="MEDIAOBJECT"
-><P
-><IMG
-SRC="figures/gimp-print-print-color-adjust.png"></P
-></DIV
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN387"
->Brightness</A
-></H4
-><P
->    Adjust the brightness of the image.  A setting of 0.0 gives a fully black
-image, while a 2.0 setting gives a fully white image.  Values greater than 1.0 will result in
- black not being solid and highlights turning white; values less than
- 1.0 will result in white not being perfectly clear and shadows turning
- black.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN390"
->Contrast</A
-></H4
-><P
->    Adjust the contrast of the image.  A setting of 0.0 gives a solid gray for the
-entire image, the exact gray depending upon the brightness chosen.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN393"
->Cyan, Magenta, Yellow</A
-></H4
-><P
->These three options allow specification of the cyan, magenta, and
-yellow levels independently, for rebalancing the levels.  Normally,
-these should be adjusted to yield neutral gray, but they can be used
-for other effects.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN396"
->Saturation</A
-></H4
-><P
->Adjust the brilliance of colors.  A setting of 0.0 results in pure grayscale.
-A saturation setting of less than 1.0 results in more muted colors.  A
-saturation setting of greater than 1.0 results in more vibrant colors.  Very high
-saturation often results in very strange effects, including
-posterization and banding that might not be expected.  For normal
-purposes, the saturation should generally be set to a value less than 1.5.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN399"
->Density</A
-></H4
-><P
->Adjust the amount of ink deposited on the paper.  If you have chosen the
-correct paper type and are getting ink bleeding through the paper
-or puddling, try reducing the density to the lowest value you
-can while still achieving solid black.  If black is not solid
-black, even with the contrast and brightness at 1.0, try increasing
-the density.  Note that changes to this setting will not be visible in
-the image preview.
-    </P
-><P
->All of the supported printers actually need less than 100% ink
-density in most cases, so the actual density is something other than
-the nominal density setting.  The effective density setting cannot go
-above 100%, so if a value specified will result in an excessively high
-density level, it will be silently limited to a setting of 1.0.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN403"
->Gamma</A
-></H4
-><P
->Adjust the gamma of the image, over and above the printer-specific
-correction.  Gamma less than 1.0 will result in a darker image; gamma
-greater than 1.0 will result in a lighter image.  Unlike brightness,
-gamma adjustment does not change the endpoints; it merely changes the
-shape of the input-&#62;output curve.
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN406"
->Dither Algorithm</A
-></H4
-><P
->The recommended dither algorithm is <SPAN
-CLASS="GUIMENUITEM"
->Adaptive
-Hybrid</SPAN
-> (which is the default) for text or other fine
-black detail, or if this is mixed with continuous tone images.  The
-<SPAN
-CLASS="GUIMENUITEM"
->Ordered</SPAN
-> dithering algorithm is just as good
-(and somewhat faster) for pure continuous-tone images and photographs,
-but may yield poor results with text or other fine detail,
-particularly at high printing resolutions.
-    </P
-><P
-> The <SPAN
-CLASS="GUIMENUITEM"
->Fast</SPAN
-> algorithm gives the
-fastest results at the expense of color accuracy.  It is a simplified
-ordered dither.  On simple four color printers (or other printers used
-in four color mode), the quality is similar to
-<SPAN
-CLASS="GUIMENUITEM"
->Ordered</SPAN
->, although dark gray rendition is
-not as good due to a simpler transfer between black and colored ink.
-With six-color printers, color rendition is somewhat worse, but it
-should be quite usable in cases where optimum quality is not critical.
-In black and white, it is an efficient way to render grayscale, but it
-may not give best results when used with variable dot size printers
-(modern Epson printers, or Canon printers using DMT).  On rare three
-color printers (CMY only) the results should be identical to ordered
-dither.
-    </P
-><P
-> <SPAN
-CLASS="GUIMENUITEM"
->Very Fast</SPAN
-> is even faster than
-<SPAN
-CLASS="GUIMENUITEM"
->Fast</SPAN
->, with even more loss of quality.
-Color and grayscale output will show strong patterning that resembles
-screening, although it isn't.  On laser printers, and possibly on
-certain kinds of text and line art, <SPAN
-CLASS="GUIMENUITEM"
->Very
-Fast</SPAN
-> dithering may actually yield the best quality.
-    </P
-><P
->Error diffusion algorithms (<SPAN
-CLASS="GUIMENUITEM"
->Hybrid
-Floyd-Steinberg</SPAN
-> is such an algorithm) perform very well
-at high densities, and are capable of
-rendering very fine detail rather well, but they tend to exhibit artifacts in
-the form of "waves" or "worms" of dots which results in noticeable
-texturing in pale areas.  Furthermore, pale areas immediately adjacent
-to white take a while to "build up" sufficient error to print at all.
-This is sometimes called "tearing" or "waterfalling".
-    </P
-></DIV
-><DIV
-CLASS="SECT4"
-><H4
-CLASS="SECT4"
-><A
-NAME="AEN420"
->Set Defaults and Close</A
-></H4
-><P
->      When the <SPAN
-CLASS="GUIBUTTON"
->Set Defaults</SPAN
-> button is clicked,
-the slider bar settings will return to their default values.  The
-dither algorithm setting is uneffected.  The <SPAN
-CLASS="GUILABEL"
->Print Color
-Adjust</SPAN
-> window will close when the
-<SPAN
-CLASS="GUIBUTTON"
->Close</SPAN
-> button is clicked.
-    </P
-></DIV
-></DIV
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="AEN426"
->Printing and Saving Settings</A
-></H2
-><P
->    At the bottom of the Gimp-Print window, there are five buttons labeled
-<SPAN
-CLASS="GUIBUTTON"
->About</SPAN
->,
-<SPAN
-CLASS="GUIBUTTON"
->Print and Save Settings</SPAN
->,
-<SPAN
-CLASS="GUIBUTTON"
->Save Settings</SPAN
->,
-<SPAN
-CLASS="GUIBUTTON"
->Print</SPAN
->,
-and <SPAN
-CLASS="GUIBUTTON"
->Cancel</SPAN
->.  The <SPAN
-CLASS="GUIBUTTON"
->About</SPAN
->
-button will show information about the Gutenprint software, such as
-the version number, authors names, project web site, and software
-licensing.  After clicking on the <SPAN
-CLASS="GUIBUTTON"
->About</SPAN
->, read
-the information, and then close the window by pressing the
-<SPAN
-CLASS="GUIBUTTON"
->OK</SPAN
-> button.
-    </P
-><P
->      The <SPAN
-CLASS="GUIBUTTON"
->Print and Save Settings</SPAN
-> button will
-save the current settings and then print the desired image.  Recall
-that these settings are saved in <TT
-CLASS="FILENAME"
->~/.gimp-1.2/printrc</TT
->.  The
-<SPAN
-CLASS="GUIBUTTON"
->Save Settings</SPAN
-> button will only save the
-settings.  The <SPAN
-CLASS="GUIBUTTON"
->Print</SPAN
-> button will print the
-image only.  The <SPAN
-CLASS="GUIBUTTON"
->Cancel</SPAN
-> will close the
-Gimp-Print GUI window.
-    </P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="book1.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="c443.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->GIMP and Gutenprint</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="ch-gimp-and-gimp-print.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->CUPS and Gutenprint</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
diff --git a/doc/users_guide/title.sgml b/doc/users_guide/title.sgml
deleted file mode 100644
index 12d83b6..0000000
--- a/doc/users_guide/title.sgml
+++ /dev/null
@@ -1,64 +0,0 @@
-    <para>
-    Permission is granted to copy, distribute and/or modify this
-document under the terms of the GNU Free Documentation License,
-Version 1.1 or any later version published by the Free Software
-Foundation with no invariant sections, no Front-Cover texts, and no
-Back-Cover texts.  A copy of the license is included in <xref linkend="gfdl">.
-    </para>
-
-  </legalnotice>
-
-  <abstract>
-  <para>
-    The Gutenprint Top Quality Printer Drivers (hereafter
-called Gutenprint) are a set of printer drivers written to
-take advantage of the full capabilities of a wide range of
-printers. These drivers should work on any POSIX compliant operating
-system (e.g. Linux, Solaris, IRIX, etc).  This document will explain how to
-use the Gutenprint software to achieve high quality printouts from the
-<ulink url="http://www.gimp.org">GIMP</ulink> (GNU Image
-Manipulation Program) and
-<ulink url="http://www.cups.org">CUPS</ulink> (Common Unix Printing
-System).
-  </para>
-  <para>
-    Please note that in addition to using the Gutenprint software as a
-print plugin for the GIMP, and as a set of printer drivers for CUPS, this
-software can also be compiled and used with the 
-<ulink url="http://www.ghostscript.com">Ghostscript</ulink> software
-and with the 
-<ulink
-url="http://www.linuxprinting.org/foomatic.html">Foomatic</ulink> 
-software.
-   </para>
-   <para>
-Regardless of whether the Gutenprint software is used with the GIMP,
-CUPS, Ghostscript, or Foomatic, the print quality and printer settings
-remain the same.  However, use of the Gutenprint with Ghostscript and
-Foomatic is not covered in this document.  These topics may be covered
-in a future revision of this document.
-  </para>
-  <para>
-  This document corresponds to version 4.2.0 and later of the Gutenprint
-software. This document will serve as a guide to the user, and as such
-will not explain how to install Gutenprint, CUPS, GIMP, Ghostscript,
-Foomatic, or any other related software.
-  </para>
-
-  <para>
-    Andy Stewart, the author, is the founder of the
-<ulink url="http://www.wlug.org">Worcester Linux Users' Group</ulink> in
-Worcester, Massachusetts, USA.  The group was founded in July 1997 and has
-approximately 140 people on its mailing list.  Monthly meetings are
-held and all are invited.
-  </para>
-
-  <para>
-    In terms of "code", this is the author's first contribution to the
-open source community, and definitely his first experience with DocBook.
-Constructive comments, praise, words of encouragement, and the like
-will be most appreciated if e-mailed to the
-<ulink url="mailto:andystewart@attbi.com">author</ulink>.
-  </para>
-  </abstract>
- </bookinfo>
diff --git a/doc/users_guide/users-guide.pdf b/doc/users_guide/users-guide.pdf
deleted file mode 100644
index 479bbc5..0000000
--- a/doc/users_guide/users-guide.pdf
+++ /dev/null
diff --git a/doc/users_guide/users-guide.sgml b/doc/users_guide/users-guide.sgml
deleted file mode 100644
index 7a22810..0000000
--- a/doc/users_guide/users-guide.sgml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp SYSTEM "gimp.sgml">
-<!ENTITY cups SYSTEM "cups.sgml">
-<!ENTITY utils SYSTEM "utils.sgml">
-<!ENTITY gfdl  SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
-  <title>The User's Guide to Gutenprint - Complete Edition</title>
-  <date>April 7, 2002</date>
-  <pubdate>April 7, 2002</pubdate>
-  <author>
-    <firstname>Andy</firstname>
-    <surname>Stewart</surname>
-  </author>
-  <copyright>
-    <year>2002</year>
-    <holder>Andy Stewart</holder>
-  </copyright>
-  <legalnotice>
-    <para>The User's Guide to Gutenprint - Complete Edition,
-Copyright 2002, Andy Stewart. 
-    </para>
-
-&title;
-&history;
-&gimp;
-&cups;
-&utils;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/util-edition.sgml b/doc/users_guide/util-edition.sgml
deleted file mode 100644
index ed45d6c..0000000
--- a/doc/users_guide/util-edition.sgml
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-<!ENTITY title   SYSTEM "title.sgml">
-<!ENTITY history SYSTEM "history.sgml">
-<!ENTITY gimp    SYSTEM "gimp.sgml">
-<!ENTITY cups    SYSTEM "cups.sgml">
-<!ENTITY utils   SYSTEM "utils.sgml">
-<!ENTITY gfdl    SYSTEM "gfdl.sgml">
-]>
-<book>
-
- <bookinfo>
-  <title>The User's Guide to the Gutenprint - UTIL Edition</title>
-  <date>April 7, 2002</date>
-  <pubdate>April 7, 2002</pubdate>
-  <author>
-    <firstname>Andy</firstname>
-    <surname>Stewart</surname>
-  </author>
-  <copyright>
-    <year>2002</year>
-    <holder>Andy Stewart</holder>
-  </copyright>
-  <legalnotice>
-    <para>The User's Guide to the Gutenprint - UTIL Edition, Copyright
-2002, Andy Stewart.
-    </para>
-
-&title;
-
-<chapter><title>UTIL Edition</title>
-
-  <caution><title>PLEASE NOTE</title>
-
-    <para>
-    This manual includes a subset of chapters from a more complete
-manual entitled <emphasis>The User's Guide to the Gutenprint Top
-Quality Printer Drivers</emphasis>.  To obtain the complete manual, go
-to the <ulink url="http://gimp-print.sourceforge.net">Gutenprint
-Project</ulink> home page.
-    </para>
-    <para>
-    This version of the manual has been specifically packaged in this
-way in an attempt to better suit the needs of people interested only
-in utility programs packaged with the Gutenprint software.
-    </para>
-
-  </caution>
-
-</chapter>
-
-&history;
-&utils;
-&gfdl;
-</book>
-
-
-
diff --git a/doc/users_guide/utils.sgml b/doc/users_guide/utils.sgml
deleted file mode 100644
index 36f6a18..0000000
--- a/doc/users_guide/utils.sgml
+++ /dev/null
@@ -1,421 +0,0 @@
-
- <chapter><title>Gutenprint Utilities</title>
-   <sect1><title>escputil</title>
-     <para>
-       <emphasis>escputil</emphasis> is a command line utility which
-allows the user to perform a variety of maintenance tasks on Epson
-Stylus inkjet printers.  These tasks include head alignment, head
-cleaning, nozzle check, printer identification, and retrieval of the ink
-level from the printer.  In order for many of the
-<emphasis>escputil</emphasis> functions to work, the user must have
-read/write access to the raw printer device (typically /dev/lp0,
-/dev/usb/lp0, and the like).  In general, these operations should be
-performed by the root user.  As always, the user must insure that the
-directory containing the <emphasis>escputil</emphasis> utility is
-listed in the &dollar;PATH environment variable, or that the full path is
-specified on the command line.  The examples in this section will
-assume the former.
-     </para>
-
-     <caution>
-     <title>Caution</title>
-     <para>
-       The <emphasis>escputil</emphasis> utility was designed for use
-ONLY with Epson Stylus inkjet printers supported by the Gutenprint
-software.  It is possible that damage MIGHT occur to your printer if
-this utility is misused or if it is used with a printer other than an
-Epson Stylus inkjet printer.  It is the sole responsibility of the
-user to insure that this utility is suitable for the task at hand.
-     </para>
-     </caution>
-
-
-     <para>
-       In this section, specific examples of common usage will be
-presented.  A summary of the command line switches can be
-found in the <emphasis>escputil</emphasis>(1) man page.
-     </para>
-
-   <sect2><title>Determining Ink Level</title>
-     <para>
-       Perhaps the most basic function performed by
-<emphasis>escputil</emphasis> is that of determining the amount of ink
-remaining in the printer. To do this, the user must know the name of
-the raw printer device.  This is usually /dev/lp0 for a printer
-connected to the parallel port, or /dev/usb/lp0 for a printer
-connected to the USB.  
-     </para>
-     <para>
-If there are multiple printers connected, one of them may be referenced as
-/dev/lp1 or perhaps /dev/usb/lp1.  In the event of uncertainty, and if
-CUPS is in use, view the following <ulink url="http://localhost:631/printers">URL</ulink> 
-with a web browser. At that URL, look for a line which reads "Device
-URI".  The author's USB printer is listed as "Device URI:  usb:/dev/usb/lp0".
-     </para>
-     <para>
-For this example, assume that the raw printer device is a USB printer
-specified as /dev/usb/lp0.  To get the ink level for this printer,
-issue this command and notice the output.
-     </para>
-
-  <programlisting>
-  <![ CDATA [
-# escputil -r /dev/usb/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details. 
-
-           Ink color    Percent remaining
-               Black     18
-                Cyan     71
-             Magenta     70
-              Yellow     67
-          Light Cyan     71
-       Light Magenta     70
-    ]]>
-  </programlisting>
-
-     <para>
-The user would substitute their own raw printer device for the one
-shown in the example after the "-r" switch.  Notice that the printout
-shows the percent of ink remaining for each color of the author's
-Epson Stylus Photo 870.  When the ink levels get too low, print
-quality will suffer.  In the author's personal experience, ink levels
-approaching 10% begin to cause print quality degredation, but this
-will vary depending on the precise printer model.
-     </para>
-   </sect2>
-
-   <sect2><title>Error During Ink Level Determination</title>
-     <para>
-       What?  The example above did not work?  An error message was
-printed?  What does it mean?  There are several possibilities,
-depending on the specific error message.  If the error message is
-"Invalid argument" (see following example), the problem is that the
-2.4.x kernel is not configured with the CONFIG_PARPORT_1284 option enabled.
-
-  <programlisting>
-  <![ CDATA [
-# escputil -r /dev/lp0 -i
-
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details.
-
-Cannot read from /dev/lp0: Invalid argument
-    ]]>
-  </programlisting>
-
-     Another possibile cause for error is that the raw printer device
-does not have both read and write permission for the user attempting
-to access the device.  In this case, the error message will read
-"Permission denied".  A final possibility is that the raw printer
-device specified is incorrect, in which case the error message will
-read "No such device".
-   </para>
-
-   </sect2>
-
-   <sect2><title>Nozzle Check</title>
-     <para>
-       On an inkjet printer, there are several small holes on the
-bottom of each ink cartridge through which the ink must flow smoothly
-in order to create high quality images on paper.  If these holes
-become clogged, the printed image will show small gaps where there
-should have been ink.  One can easily test for the existence of this
-condition by running a nozzle check.  One need not be the root user to
-issue this command.  Note that as shown, the command will print a
-nozzle test pattern on the default printer.  If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
-     </para>
-     <para>
-       The printer will print a series of black (and colored) slanted
-lines on the paper.  Observe these lines carefully.  If there are gaps
-or spaces in these lines, then the corresponding nozzle is clogged and
-the print head must be cleaned.  However, if there are no gaps, the 
-nozzles are clean.
-     </para>
-  <programlisting>
-  <![ CDATA [
-# escputil -n       
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details. 
-
-Running nozzle check, please ensure paper is in the printer.
-    ]]>
-  </programlisting>
-   </sect2>
-
-   <sect2><title>Clean the Print Head</title>
-     <para>
-       If the printed output is showing gaps where there should have
-been ink, it is likely that one or more nozzles are clogged and the
-print head is in need of cleaning.  One can verify this by first
-running a nozzle check and looking for gaps in the printout.  To clean
-the print head, issue the following command.  One need not be the root user to
-issue this command.  Note that as shown, the command will clean the
-print head on the default printer.  If there are multiple
-printers present, the desired printer must be specified with an
-additional "-P printer_name" switch, where "printer_name" is the name
-of the desired printer.
-     </para>
-  <programlisting>
-  <![ CDATA [
-# escputil -c
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it 
-under certain conditions; type 'escputil -l' for details. 
-
-Cleaning heads...
-    ]]>
-  </programlisting>
-     <para>
-       Nothing will be printed on the paper.  The printer will make
-some noise as it cleans the print head.  Wait until the printer is
-finished cleaning the print head.  Afterwards, execute another nozzle
-check and insure that the print head is indeed completely clean.  Note
-that the process of cleaning the print head causes ink consumption, so
-do not clean the print head any more than necessary.
-     </para>
-     <para>
-For severely clogged nozzles, one may have to execute two or three cycles
-of nozzle check followed by a cleaning of the print head.  If the
-printer had gone unused for a long time, the nozzles may be so clogged
-with dried ink as to be unrecoverable, in which case, the best course
-of action is to replace the ink cartridge.
-     </para>
-   </sect2>
-
-   <sect2><title>Align the Print Head</title>
-     <para>
-       To insure the highest quality printouts, the print head must
-be in proper physical alignment.  One can check and realign the print
-head by running this interactive alignment test.  
-     </para>
-     <para>
-The <emphasis>escputil</emphasis> utility must know the exact printer model in
-use.  One may specify the model on the command line using the "-m"
-switch, or the utility can detect the printer model if the user passes
-the "-r" switch and the name of the raw printer device.  
-     </para>
-     <para>
-Note that an unprivileged user may use this command with the "-m" switch, but that
-(in general) the root user may only use the "-r" switch (which
-requires read/write access to the raw printer device).  In the case of
-multiple printers in use, the "-P" switch is required to align the
-print head on the non-default printer.
-     </para>
-
-     <caution>
-     <title>Caution</title>
-     <para>
-This utility lets you align the print head of your Epson Stylus inkjet
-printer.  Misuse of this utility may cause your print quality to degrade
-and possibly damage your printer.  This utility has not been reviewed by
-Seiko Epson for correctness, and is offered with no warranty at all.  The
-entire risk of using this utility lies with you.
-     </para>
-     </caution>
-
-     <para>
-       Aligning the print head is an interactive process.  The utility
-will print out a set of instructions and ask you for responses.  Please
-read the instructions carefully and follow them precisely.  A single
-sheet of paper will be needed (one can print on both sides to save paper).
-     </para>
-     <para>
-The following example illustrates the alignment process when issued by an
-unprivileged user who specified the printer model on the command
-line.  (To obtain a list of printer models, issue the "escputil -M"
-command).  Of course, your responses will vary and should be
-substituted for the responses shown in the following example.
-     </para>
-  <programlisting>
-  <![ CDATA [
-
-*** NOTE - 870 is an illustrative example! ***
-*** You MUST use the proper printer model! ***
-*** Run:  escputil -M for a listing of     ***
-*** supported printer models!              ***
-
-linuxpc> escputil -a -m 870
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Please read these instructions very carefully before proceeding.
-
-This utility lets you align the print head of your Epson Stylus 
-inkjet printer.  Misuse of this utility may cause your print 
-quality to degrade and possibly damage your printer.  This utility
-has not been reviewed by Seiko Epson for correctness, and is 
-offered with no warranty at all.  The entire risk of using this 
-utility lies with you.
-
-This utility prints 3 test patterns.  Each pattern looks very
-similar.  The patterns consist of a series of pairs of vertical
-lines that overlap.  Below each pair of lines is a number between 
-1 and 15.
-
-When you inspect the pairs of lines, you should find the pair
-of lines that is best in alignment, that is, that best forms 
-a single vertical line.  Inspect the pairs very carefully to 
-find the best match.  Using a loupe or magnifying glass is 
-recommended for the most critical inspection.  It is also 
-suggested that you use a good quality paper for the test, so 
-that the lines are well-formed and do not spread through the 
-paper.  After picking the number matching the best pair, place 
-the paper back in the paper input tray before typing it in.
-
-Each pattern is similar, but later patterns use finer dots for
-more critical alignment.  You must run all of the passes to 
-correctly align your printer.  After running all the alignment
-passes, the alignment patterns will be printed once more.  You 
-should find that the middle-most pair (#8 out of the 15) is the
-best for all patterns. 
-
-After the passes are printed once more, you will be offered the
-choices of (s)aving the result in the printer, (r)epeating the
-process, or (q)uitting without saving.  Quitting will not restore
-the previous settings, but powering the printer off and back 
-on will.  If you quit, you must repeat the entire process if 
-you wish to later save the results.  It is essential that you 
-not turn your printer off during this procedure.
-
-This procedure assumes that your printer is an Epson Stylus Photo
-870.  If this is not your printer model, please type control-C now
-and choose your actual printer model.
-
-Please place a sheet of paper in your printer to begin the head
-alignment procedure. 
-Press enter to continue > 
-Please inspect the print, and choose the best pair of lines in 
-each pattern.  Type a pair number, '?' for help, or 'r' to repeat
-the procedure.
-Pass #1> 8
-Pass #2> 8
-Pass #3> 8
-Attempting to set alignment...succeeded.
-Please verify that the alignment is correct.  After the alignment
-pattern is printed again, please ensure that the best pattern 
-for each line is pattern 8.  If it is not, you should repeat the 
-process to get the best quality printing. 
-Please insert a fresh sheet of paper.
-Press enter to continue > 
-Please inspect the final output very carefully to ensure that your
-printer is in proper alignment. You may now: 
-  (s)ave the results in the printer,
-  (q)uit without saving the results, or
-  (r)epeat the entire process from the beginning.
-You will then be asked to confirm your choice.
-What do you want to do (s, q, r)?
-> s
-This will permanently alter the configuration of your printer.
-WARNING: this procedure has not been approved by Seiko Epson, 
-and it may damage your printer. Proceed? 
-Please confirm by typing 's' again that you wish to save the 
-settings to your printer: 
-> s
-About to save settings...succeeded!
-Your alignment settings have been saved to the printer.
-    ]]>
-  </programlisting>
-    <para>
-      The following example shows what will happen if an unprivileged
-user attempts to align the print head by specifying the raw printer
-device on the command line.
-    </para>
-
-  <programlisting>
-  <![ CDATA [
-linuxpc> escputil -a -r /dev/usb/lp0
-Escputil version 4.2.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...
-Cannot open /dev/usb/lp0 read/write: Permission denied
-    ]]>
-  </programlisting>
-
-    <para>
-      This next example illustrates the results obtained when the root
-user issues an alignment command while specifying the raw printer
-device.  Note that the output is truncated and only shows the printer
-detection output.
-    </para>
-
-  <programlisting>
-  <![ CDATA [
-# escputil -a -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-Attempting to detect printer model...Stylus Photo 870
-
-Please read these instructions very carefully before proceeding.
-    ]]>
-  </programlisting>
-
-   </sect2>
-
-   <sect2><title>Printer Identification</title>
-     <para>
-       The printer identification command will query the printer for
-make and model information.  This command requires read/write access
-to the raw printer device (generally limited to the root user).
-Substitute your own raw printer device in place of the /dev/usb/lp0
-shown in the example.  The output will vary depending on the precise
-printer model.
-     </para>
-
-  <programlisting>
-  <![ CDATA [
-# escputil -d -r /dev/usb/lp0
-Escputil version 4.3.0, Copyright (C) 2000-2001 Robert Krawitz
-Escputil comes with ABSOLUTELY NO WARRANTY; for details type 
-'escputil -l'
-This is free software, and you are welcome to redistribute it
-under certain conditions; type 'escputil -l' for details.
-
-@EJL ID
-MFG:EPSON;CMD:ESCPL2,BDC;MDL:Stylus Photo 870;CLS:PRINTER;DES:
-EPSON Stylus Photo 870;
-    ]]>
-  </programlisting>
-
-   </sect2>
-
-   <sect2><title>More Information</title>
-     <para>
-       For more detailed information about the command line switches
-accepted by the <emphasis>escputil</emphasis> utility, please consult
-the man page which is supplied with the Gutenprint software.  The user
-may also issue the "escputil --help" command to get a listing of supported
-command line switches.  The command requires no special privileges to execute.
-     </para>
-
-   </sect2>
-
-  </sect1>
-
- </chapter>
diff --git a/include/Makefile.am b/include/Makefile.am
index 526a5a5..732394a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.6 2004/09/17 18:37:44 rleigh Exp $
+## $Id: Makefile.am,v 1.7 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000,2004 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 SUBDIRS = gutenprint gutenprintui gutenprintui2
 
 include $(top_srcdir)/scripts/global.mk
diff --git a/include/Makefile.in b/include/Makefile.in
index 2c7a865..3c2b9a8 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,6 +53,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -67,8 +69,6 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -106,7 +106,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -119,14 +118,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -261,13 +258,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -313,8 +305,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 SUBDIRS = gutenprint gutenprintui gutenprintui2
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MAINTAINERCLEANFILES = Makefile.in
@@ -330,9 +320,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/include/gutenprint/Makefile.am b/include/gutenprint/Makefile.am
index e86b99f..28bc158 100644
--- a/include/gutenprint/Makefile.am
+++ b/include/gutenprint/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.1 2004/09/17 18:38:01 rleigh Exp $
+## $Id: Makefile.am,v 1.2 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/include/gutenprint/Makefile.in b/include/gutenprint/Makefile.in
index b7291cb..aa50960 100644
--- a/include/gutenprint/Makefile.in
+++ b/include/gutenprint/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -56,6 +56,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gutenprint-version.h
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -75,8 +77,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -114,7 +114,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -127,14 +126,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -269,13 +266,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -321,8 +313,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 noinst_HEADERS = gutenprint-intl.h gutenprint-intl-internal.h
 pkginclude_HEADERS = \
@@ -367,9 +357,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/gutenprint/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/gutenprint/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/gutenprint/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps include/gutenprint/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/include/gutenprint/color.h b/include/gutenprint/color.h
index 7210897..d0a6e0a 100644
--- a/include/gutenprint/color.h
+++ b/include/gutenprint/color.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: color.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: color.h,v 1.2 2005/10/18 02:08:16 rlk Exp $"
  *
  *   libgimpprint color functions.
  *
@@ -130,9 +130,14 @@ stp_color_get_name(const stp_color_t *c);
 extern const char *
 stp_color_get_long_name(const stp_color_t *c);
 
+  /** @} */
+
+#ifdef __cplusplus
+  }
+#endif
 
 
 #endif /* GUTENPRINT_COLOR_H */
 /*
- * End of "$Id: color.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: color.h,v 1.2 2005/10/18 02:08:16 rlk Exp $".
  */
diff --git a/include/gutenprint/curve-cache.h b/include/gutenprint/curve-cache.h
index d63cb7a..e12c4e9 100644
--- a/include/gutenprint/curve-cache.h
+++ b/include/gutenprint/curve-cache.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: curve-cache.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: curve-cache.h,v 1.2 2005/10/18 02:08:16 rlk Exp $"
  *
  *   Gimp-Print color management module - traditional Gimp-Print algorithm.
  *
@@ -62,7 +62,7 @@ extern void stp_curve_cache_set_curve(stp_cached_curve_t *cache,
 extern void stp_curve_cache_set_curve_copy(stp_cached_curve_t *cache,
 					   const stp_curve_t *curve);
 
-extern const size_t stp_curve_cache_get_count(stp_cached_curve_t *cache);
+extern size_t stp_curve_cache_get_count(stp_cached_curve_t *cache);
 
 extern const unsigned short *stp_curve_cache_get_ushort_data(stp_cached_curve_t *cache);
 
diff --git a/include/gutenprint/image.h b/include/gutenprint/image.h
index ab9902d..8a1a112 100644
--- a/include/gutenprint/image.h
+++ b/include/gutenprint/image.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: image.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $"
+ * "$Id: image.h,v 1.2 2005/10/18 02:08:16 rlk Exp $"
  *
  *   libgimpprint image functions.
  *
@@ -134,11 +134,13 @@ extern stp_image_status_t stp_image_get_row(stp_image_t *image,
 extern const char *stp_image_get_appname(stp_image_t *image);
 extern void stp_image_conclude(stp_image_t *image);
 
+  /** @} */
+
 #ifdef __cplusplus
   }
 #endif
 
 #endif /* GUTENPRINT_IMAGE_H */
 /*
- * End of "$Id: image.h,v 1.1 2004/09/17 18:38:01 rleigh Exp $".
+ * End of "$Id: image.h,v 1.2 2005/10/18 02:08:16 rlk Exp $".
  */
diff --git a/include/gutenprintui/Makefile.am b/include/gutenprintui/Makefile.am
index caf14b9..b112e84 100644
--- a/include/gutenprintui/Makefile.am
+++ b/include/gutenprintui/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2004/10/31 22:29:24 rleigh Exp $
+## $Id: Makefile.am,v 1.3 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/include/gutenprintui/Makefile.in b/include/gutenprintui/Makefile.in
index b66e5dc..3f5eb4c 100644
--- a/include/gutenprintui/Makefile.in
+++ b/include/gutenprintui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,6 +53,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__pkginclude_HEADERS_DIST = gutenprintui.h
@@ -71,8 +73,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgincludedir = $(includedir)/gutenprintui
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -110,7 +110,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -123,14 +122,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -265,13 +262,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -317,8 +309,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 @BUILD_LIBGUTENPRINTUI_TRUE@pkginclude_HEADERS = \
 @BUILD_LIBGUTENPRINTUI_TRUE@	gutenprintui.h
@@ -336,9 +326,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/gutenprintui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/gutenprintui/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/include/gutenprintui2/Makefile.am b/include/gutenprintui2/Makefile.am
index b848039..2f354fa 100644
--- a/include/gutenprintui2/Makefile.am
+++ b/include/gutenprintui2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.2 2004/10/31 22:29:24 rleigh Exp $
+## $Id: Makefile.am,v 1.3 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/include/gutenprintui2/Makefile.in b/include/gutenprintui2/Makefile.in
index d2a162f..d44c577 100644
--- a/include/gutenprintui2/Makefile.in
+++ b/include/gutenprintui2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,6 +53,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__pkginclude_HEADERS_DIST = gutenprintui.h curve.h gammacurve.h \
@@ -72,8 +74,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgincludedir = $(includedir)/gutenprintui2
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -111,7 +111,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -124,14 +123,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -266,13 +263,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -318,8 +310,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 stpui_public_h_sources = \
 	gutenprintui.h		\
@@ -347,9 +337,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/gutenprintui2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  include/gutenprintui2/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps include/gutenprintui2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/m4/stp_release.m4 b/m4/stp_release.m4
index 21ea0c2..a47f9e1 100644
--- a/m4/stp_release.m4
+++ b/m4/stp_release.m4
@@ -24,6 +24,6 @@
 # Makefiles.
 AC_DEFUN([STP_RELEASE_DATE],
 [dnl Set package release date
-RELEASE_DATE="27 Aug 2005"
+RELEASE_DATE="22 Nov 2005"
 AC_DEFINE_UNQUOTED(RELEASE_DATE, "${RELEASE_DATE}", [Package release date.])
 AC_SUBST(RELEASE_DATE)])
diff --git a/man/Makefile.am b/man/Makefile.am
index 8b0c91c..8c75859 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.21 2005/04/18 10:54:56 rleigh Exp $
+## $Id: Makefile.am,v 1.22 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/man/Makefile.in b/man/Makefile.in
index ff83c09..f210fd5 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -58,6 +58,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = cups-calibrate.8 cups-genppd.8 \
 	cups-genppdconfig.8 cups-genppdupdate.8 escputil.1 \
 	ijsgutenprint.1
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 man1dir = $(mandir)/man1
@@ -68,8 +70,6 @@ MANS = $(man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -107,7 +107,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -120,14 +119,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -262,13 +259,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -314,8 +306,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 
 # Conditional installation of manpages is currently broken in automake...
@@ -350,9 +340,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  man/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps man/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  man/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/po/cs.gmo b/po/cs.gmo
index 42bf400..086fc4d 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 3332cf7..c96dc3d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.6-pre1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2003-05-03 19:43+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -77,16 +77,16 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -139,313 +139,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozkladu barev"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Normální papír"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Normální papír"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Fólie"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Listy tkaniny"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Obálka"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Papír pro vysoká rozlišení"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "Obtisk na tri�ko"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Potah s vysokým leskem"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Lesklý fotopapír"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Lesklé foto karty"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Profesionální fotopapír"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Jiný"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Velikost"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Název tiskárny:"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Velikost papíru, na který chcete tisknout"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupní otvor) média, na které tisknete"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Rozlišení a kvalita tisku"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ inkoustu"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ inkoustu v tiskárně"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -455,78 +455,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tiskárny:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papír ColorLife"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Fialová"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -534,18 +542,18 @@ msgstr "Upravit vyrovnání modrozelené tisku"
 msgid "Light Cyan Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -553,56 +561,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Světle fialová"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Automatický podava� listů"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Ru�ní s přestávkou"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Ru�ní bez přestávky"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Matný papír"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Černá"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "Barvy CMY"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "Barvy CMYK"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Fotografické barvy CcMmY"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Fotografické barvy CcMmYK"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Barva"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -643,9 +671,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Vytisknout"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Odstíny šedi"
 
@@ -670,114 +698,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Zrušit"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Typ obrázku"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Typ obrázku"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gama:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Jas:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Nastavit výšku tisku"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Ru�ní"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -787,129 +824,135 @@ msgstr ""
 "hodnoty způsobí obecně tmavší tisk. Černá a bílá zůstanou stejné, narozdíl "
 "od úpravy jasu."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Modrozelená"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Fialová"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Odstíny šedi"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Fialová"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Sytost:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -918,183 +961,183 @@ msgstr ""
 "Použijte nulovou sytost pro vytvoření výstupu ve stupních šedi pomocí "
 "barevných a �erných inkoustů"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Typ inkoustu"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Zrušit"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Fialová"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Černá"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Žlutá"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Sytost:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1185,132 +1228,138 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standardní"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Podávací válec"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr "Podávací válec (odříznout každou stranu)"
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr "Podávací válec (neodřezávat)"
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr "Přihrádka řezaných listů 1"
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr "Přihrádka řezaných listů 2"
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výběr řezaných listů"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr "Ru�ní výběr"
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Výška:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografie"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Å est barev foto"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Světle fialová"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Černá"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Černá/tmavá žlutá"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papír"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapír"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý potah"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Černá"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1380,11 +1429,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1533,105 +1582,106 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Světle modrozelená"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tisknout do souboru?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ru�ní"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosměrně"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tiskárna nepodporuje barevný výstup\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1685,144 +1735,155 @@ msgid "test print"
 msgstr "testovací tisk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Čtyři barvy standardní"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Tři barvy kompozitní"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Å est barev foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Pět barev foto kompozitní"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Lesklý potah"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papír pro inkoustové tiskárny ve foto kvalitě"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Fotopapír"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý papír ve foto kvalitě"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý potah"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papír"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Upravit vyrovnání fialové tisku"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Upravit vyrovnání žluté tisku"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Černobíle"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Upravit vyrovnání modrozelené tisku"
@@ -1903,14 +1964,6 @@ msgstr "600×600 DPI �ernobíle"
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Barevná a �erná cartridge"
@@ -1919,27 +1972,17 @@ msgstr "Barevná a �erná cartridge"
 msgid "Color + Photo Cartridges"
 msgstr "Barevná a foto cartridge"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "Soubor PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "Soubor PPD?"
@@ -1948,160 +1991,178 @@ msgstr "Soubor PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "Dva úrovně stupňů šedi"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Dva úrovně stupňů šedi"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Å est barev foto"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tři barvy kompozitní"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tři barvy kompozitní"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Čtyři barvy standardní"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Šet barev rozšířené kompozitní"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sedm barev foto"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sedm barev rozšířené"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Å est barev foto"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Å est barev foto"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Rychlé podávání normálního papíru"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohlednice"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Extra lesklý fotopapír"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papír ColorLife"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papír"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2169,68 +2230,78 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI nejvyšší kvalita"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Název tiskárny:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
@@ -2936,1313 +3007,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C41ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C50"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C50"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Palec"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Nastavit základní jednotku měření na centimetry"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Nastavit základní jednotku měření na palce"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Barevný výstup"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Tisknout v odstínech šedi pomocí �erného inkoustu"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standardní"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Příkaz:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Soubor"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "Budiž"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tisk v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "O programu"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4250,7 +4474,7 @@ msgstr ""
 "Vytisknout a\n"
 "uložit nastavení"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4258,15 +4482,15 @@ msgstr ""
 "Uložit\n"
 "nastavení"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4290,74 +4514,74 @@ msgstr ""
 "Pokud při tažení myší klikněte jiným tla�ítkem, obrázek se vrátí na svou "
 "původní pozici."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Rozměry:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Šířka:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Šířka papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Výška:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Výška papíru, na který chcete tisknout"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozice"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Na výšku"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Na šířku"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Vzhůru nohama"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Na stranu"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4365,124 +4589,124 @@ msgstr ""
 "Vyberte orientaci: na výšku, na šířku, vzhůru nohama nebo na stranu (na "
 "šířku vzhůru nohama)"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientace:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Levý:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Vzdálenost od levého okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Vzdálenost od levého okraje papíru k pravému okraji obrázku"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Vzdálenost od pravého okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Horní:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Vzdálenost od horního okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Spodní:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Vzdálenost od horního okraje papíru k spodnímu okraji obrázku"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Vzdálenost od spodního okraje papíru k obrázku"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Vycentrovat:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontálně"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrovat obrázek na papíře horizontálně"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Obojí"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Vycentrovat obrázek na papíře"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikálně"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrovat obrázek na papíře vertikálně"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Nastavit tiskárnu"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Model tiskárny:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Vyberte model své tiskárny"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "Soubor PPD:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Procházet"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Zvolte správný název souboru PPD pro svou tiskárnu"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4491,54 +4715,54 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Zadejte správný název souboru PPD pro svou tiskárnu"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "testovací tisk"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Tisknout do souboru?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Definovat novou tiskárnu"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Název tiskárny:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Zadejte název, který chcete dát této logické tiskárně"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verze Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4583,11 +4807,11 @@ msgstr ""
 "pokud se tak nestalo, napište Free Software Foundation, Inc., 59 Temple\n"
 "Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Nastavení tiskárny"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4595,11 +4819,11 @@ msgstr ""
 "Vyberte název tiskárny (ne typ nebo model tiskárny), na kterou chcete "
 "tisknout"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Nastavit tiskárnu..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4607,11 +4831,11 @@ msgstr ""
 "Zvolte model tiskárny, soubor PPD a příkaz, který se používá pro tisk na "
 "tuto tiskárnu"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Nová tiskárna..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4619,24 +4843,24 @@ msgstr ""
 "Definovat novou logickou tiskárnu. Toto může být použito pro pojmenování "
 "sady nastavení, které si chcete zapamatovat pro budoucí použití."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Typ obrázku"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Měřítko:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Nastavte měřítko (velikost) obrázku"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4644,31 +4868,31 @@ msgstr ""
 "Vyberte, jestli je měřítko měřeno jako procenta dostupné velikosti stránky "
 "nebo po�et výstupních bodů na palec"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Procenta"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Upravit tisk na velikost stránky"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Upravit tisk na po�et bodů na palec"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Nastavit šířku tisku"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Nastavit výšku tisku"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4676,67 +4900,67 @@ msgstr ""
 "Použít původní\n"
 "velikost obrázku"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Nastavit velikost tisku na velikost obrázku"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Úprava barvy tisku"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Nastavit implicitní"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Zavřít"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Náhled obrázku"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Zvolte požadovaný typ výstupu"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Upravit výstup..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "Upravit vyrovnání barev, jask, kontrast, sytost a algoritmus rozkladu"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Vyberte základní jednotku měření pro tisk"
 
@@ -4769,12 +4993,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Vytisknout"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Nastavit tiskárnu"
@@ -4824,67 +5048,67 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Název tiskárny:"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Příkaz:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Podava� 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Podava� 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Podava� 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Podava� 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "testovací tisk"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Czech"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5153,18 +5377,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nemohu �íst z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Nemohu otevřít %s pro �tení i zápis: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5173,7 +5397,7 @@ msgstr ""
 "\n"
 "Nemohu zapisovat do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5191,81 +5415,82 @@ msgstr ""
 "Nemohu detekovat typ tiskárny.\n"
 "Použijte prosím -m pro ur�ení modelu své tiskárny.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Nemohu zpracovat výstup z tiskárny\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Tiskárna nepodporuje barevný výstup\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Barva inkoustu"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Zbývá procent"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Získání hladiny inkoustu vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identifikace tiskárny vyžaduje použití přímého zařízení.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Můžete zadat jen jeden model tiskárny."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Čistím hlavy...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Spouštím test trysek, přesvěd�te se prosím, že v tiskárně je papír.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5338,7 +5563,7 @@ msgstr ""
 "abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5402,12 +5627,12 @@ msgstr ""
 "Je důležité, abyste v průběhu této procedury nevypínali svou tiskárnu.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nemohu odeslat příkaz tiskárně, kon�ím.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5426,13 +5651,13 @@ msgstr ""
 "Pak budete požádáni o potvrzení svého výběru.\n"
 "Co chcete udělat (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5440,7 +5665,7 @@ msgstr ""
 "Potvr�te prosím, že chcete skon�it bez ukládání, opětovným\n"
 "napsáním 'q':\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5449,7 +5674,7 @@ msgstr ""
 "Dobře, vaše tiskárna je zarovnaná, ale zarovnání nebylo uloženo.\n"
 "Pokud chcete zarovnání uložit, musíte tento proces zopakovat.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5458,12 +5683,12 @@ msgstr ""
 "Potvr�te prosím, že chcete zopakovat proces zarovnávání, opětovným\n"
 "napsáním 'r':\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakuji proces zarovnávání.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5478,17 +5703,17 @@ msgstr ""
 "Potvr�te prosím, že chcete uložit nastavení do své tiskárny, opětovným\n"
 "napsáním 's':\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Připravuji se uložit nastavení..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "selhalo!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5497,27 +5722,27 @@ msgstr ""
 "Vaše nastavení nebylo uloženo úspěšně. Musíte zopakovat proceduru\n"
 "zarovnávání.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "uspělo!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vaše nastavení zarovnání bylo uloženo do tiskárny.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Nerozpoznaný příkaz.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Poslední příkaz nebyl potvrzen.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5534,12 +5759,12 @@ msgstr ""
 "Pro spuštění procedury zarovnání hlav prosím vložte do své tiskárny\n"
 "list papíru.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Pokra�ujte stisknutím enter > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5549,42 +5774,42 @@ msgstr ""
 "Zkontrolujte prosím výtisk a zvolte nejlepší dvojici �ar v každém vzorku.\n"
 "Napište �íslo dvojice, '?' pro nápovědu nebo 'r' pro zopakování procedury.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Průchod #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vložte prosím nový list papíru.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Číslo mimo rozsah!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nemohu pochopit, co jste napsali!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Nejlepší dvojice �ar by měla mít �íslo mezi 1 a %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokouším se nastavit zarovnání..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "uspělo.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5597,7 +5822,7 @@ msgstr ""
 "vzorek %d. Pokud není, měli byste pro získání nejlepší kvality tisku proces\n"
 "zopakovat.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba ve vstupu\n"
diff --git a/po/da.gmo b/po/da.gmo
index 9fd1a7b..cc7b8be 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index aab0033..5d363c4 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0-b5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2005-08-17 16:11+0200\n"
 "Last-Translator: Mogens Jaeger <mogensjaeger@get2net.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -75,16 +75,16 @@ msgstr "Forud dithered inddata"
 msgid "Density"
 msgstr "Tæthed"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -144,283 +144,283 @@ msgstr "Farveomsætningsmodul"
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI"
 msgstr "90x90 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI DMT"
 msgstr "90x90 DPI DMT"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI"
 msgstr "180x180 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI DMT"
 msgstr "180x180 DPI DMT"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI"
 msgstr "360x360 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI DMT"
 msgstr "360x360 DPI DMT"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI"
 msgstr "720x360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI DMT"
 msgstr "720x360 DPI DMT"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI"
 msgstr "720x720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI DMT"
 msgstr "720x720 DPI DMT"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI"
 msgstr "1440x720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI DMT"
 msgstr "1440x720 DPI DMT"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI"
 msgstr "1440x1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI DMT"
 msgstr "1440x1440 DPI DMT"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI"
 msgstr "2880x2880 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI DMT"
 msgstr "2880x2880 DPI DMT"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI DMT"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI DMT"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI DMT"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI DMT"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI DMT"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI"
 msgstr "1200x1200 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI DMT"
 msgstr "1200x1200 DPI DMT"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI"
 msgstr "2400x2400 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI DMT"
 msgstr "2400x2400 DPI DMT"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Almindeligt papir"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 msgid "Plain Paper PIXMA"
 msgstr "Almindeligt papir PIXMA"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Transparenter"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Bagside-printfilm"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Stofark"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Kuvert"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Højopløsningspapir"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T-shirt overføring"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Højglansfilm"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Blankt fotopapir"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Blanke fotokort"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Prof. fotopapir"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Andet"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr "Papirstørrelse"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 msgid "Basic Printer Setup"
 msgstr "Basis printerindstillinger"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr "Størrelse på det papir der skal udskrives på"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Medietype (almindeligt papir, fotopapir, o.s.v.)"
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr "I hvilken bakke er mediet"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Opløsning og kvalitet af udskriften"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blæktype"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Avanceret printeropsætning"
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Blæktype i printeren"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr "Blækkanaler"
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -430,141 +430,169 @@ msgstr "Blækkanaler"
 msgid "Advanced Printer Functionality"
 msgstr "Avanceret printerfunktionalitet"
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printningstilstand"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Kerneparameter"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printnings udskriftstilstand"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr "Tosidet printning"
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr "Duplex/Tumble indstilling"
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 msgid "Cyan Density"
 msgstr "Tæthed for cyan"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr "Justér tæthed for cyan"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 msgid "Magenta Density"
 msgstr "Tæthed for magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr "Justér tæthed for magenta"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 msgid "Yellow Density"
 msgstr "Tæthed for gul"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr "Justér tæthed for gul"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 msgid "Black Density"
 msgstr "Tæthed for sort"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr "Justér tæthed for sort"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr "Avanceret blækjustering"
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr "Lys cyan overgang"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 msgid "Light Yellow Transition"
 msgstr "Lys gul overgang"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr "Afbrudt"
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr "Kort kant (vend)"
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Automatisk arkføder"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manuel fødning med pause"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manuel fødning uden pause"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Mat"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Sort"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY farver"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK farver"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Foto CcMmY farver"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK farver"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farver"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -602,9 +630,9 @@ msgstr "Ingen korrektioner"
 msgid "Pre-Dithered"
 msgstr "Forud dithered"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Gråtone"
 
@@ -628,103 +656,112 @@ msgstr "CMYK"
 msgid "KCMY"
 msgstr "KCMY"
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 msgid "Channel "
 msgstr "Kanal "
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 msgid " Gamma"
 msgstr "Gamma"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr "Gammaværdi for ufiltreret kanal "
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr "Farvekorrektion"
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr "Basis billedjustering"
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr "Farvekorrektion der skal anvendes"
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr "Kanalbitdybde"
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr "Bitdybde pr. kanal"
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 msgid "Input Image Type"
 msgstr "Inddata billedtype"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 msgid "Input image type"
 msgstr "Inddata billedtype"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 msgid "Output Image Type"
 msgstr "Udskrifts billedtype"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 msgid "Output image type"
 msgstr "Udskrifts billedtype"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr "Ufiltrerede kanaler"
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Program gamma"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 msgid "Brightness"
 msgstr "Lyshed"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 msgid "Brightness of the print"
 msgstr "Lyshed for udskriften"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr "Udskriftens kontrast (0 giver en ren grå flade)"
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr "Lineær kontrastjustering"
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Advanced Image Control"
 msgstr "Avanceret billedkontrol"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr "Brug lineær kontra fastholdt endepunkts-kontrastjustering"
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr "Sammensat gamma"
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
@@ -732,114 +769,120 @@ msgstr ""
 "Justér udskriftens gamma. Større værdier giver et generelt lysere resultat, "
 "mens mindre værdier giver et generelt mørkere resultat. "
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 msgid "AppGamma"
 msgstr "Program gamma"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr "Gammaværdi som formodet af program"
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
 msgstr "Justér gamma for cyan"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
 msgstr "Justér gamma for magenta"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Gul"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr "Justér gamma for gul"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr "Rød"
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 msgid "Adjust the red gamma"
 msgstr "Justér gamma for rød"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr "Grøn"
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 msgid "Adjust the green gamma"
 msgstr "Justér gamma for grøn"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr "Blå"
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
 msgstr "Justér gamma for blå"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "Justér sort gamma"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr "Cyan balance"
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 msgid "GrayBalance"
 msgstr "Grå balance"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr "Justér cyans gråbalance"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 msgid "Magenta Balance"
 msgstr "Magenta balance"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
 msgstr "Justér magentas gråbalance"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 msgid "Yellow Balance"
 msgstr "Gul balance"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
 msgstr "Justér guls gråbalance"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 msgid "Saturation"
 msgstr "Mætning"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -847,164 +890,164 @@ msgstr ""
 "Justér udskriftens mætning (farve balance)\n"
 "Brug nul-mætning til et gråskalaudskrift med farve og sort blæk"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 msgid "Ink Limit"
 msgstr "Begræns blækmængde"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr "Avanceret udskriftskontrol"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr "Begræns den samlede mængde blæk der printes på siden"
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr "GCR overgang"
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr "Justér den grå bestanddels overgangsniveau"
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr "GCR nedre grænse"
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr "Nedre grænse for reduktion af grå bestanddel"
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr "GCR overgrænse"
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr "Overgrænse for reduktion af grå bestanddel"
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 msgid " Curve"
 msgstr "Kurve"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 msgid "Output Curves"
 msgstr "Uddata kurver"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr "Kurve for ufiltreret kanal "
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr "Cyan kurve"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 msgid "Cyan curve"
 msgstr "Cyan kurve"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 msgid "Magenta Curve"
 msgstr "Magenta kurve"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 msgid "Magenta curve"
 msgstr "Magenta kurve"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 msgid "Yellow Curve"
 msgstr "Gul kurve"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 msgid "Yellow curve"
 msgstr "Gul kurve"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 msgid "Black Curve"
 msgstr "Sort kurve"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 msgid "Black curve"
 msgstr "Sort kurve"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 msgid "Red Curve"
 msgstr "Rød kurve"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 msgid "Red curve"
 msgstr "Rød kurve"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 msgid "Green Curve"
 msgstr "Grøn kurve"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 msgid "Green curve"
 msgstr "Grøn kurve"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 msgid "Blue Curve"
 msgstr "Blå kurve"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 msgid "Blue curve"
 msgstr "Blå kurve"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 msgid "White Curve"
 msgstr "Gul kurve"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 msgid "White curve"
 msgstr "Hvid kurve"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr "Farvetonediagram"
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr "Avancerede HSL kurver"
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr "Farvetone justeringskurve"
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 msgid "Saturation Map"
 msgstr "Mætningsdiagram"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr "Mætnings justeringskurve"
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr "Lysintensitetsdiagram"
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr "Lysintensitets justeringskurve"
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr "Grå bestanddels reduktion"
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr "Grå bestanddels reduktionskurve"
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditionel Gutenprint farveomsætning"
 
@@ -1096,119 +1139,125 @@ msgstr ""
 "Billedet er for langt til siden: top margin er %d, højde %d, bund kant er %"
 "d\n"
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Rulle fødning"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr "Rulle fødning (skær efter hver side)"
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr "Rulle fødning (ingen afskæring)"
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 msgid "Manual Feed"
 msgstr "Manuel fødning"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 msgid "Print to CD"
 msgstr "Udskriv på Cd"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr "Tilskårne ark, bakke 1"
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr "Tilskårne ark, bakke 2"
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisk valg af bakke"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr "Manuel udvælgelse"
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr "Hurtig økonomisk"
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr "Økonomisk"
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr "Kladde"
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 msgid "High"
 msgstr "Høj"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr "Super foto"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr "Ultra foto"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr "Bedst"
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 msgid "Light Black"
 msgstr "Lys sort"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 msgid "Dark Yellow"
 msgstr "Mørk gul"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 msgid "Matte Black"
 msgstr "Mat sort"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 msgid "Photo Black"
 msgstr "Foto sort"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 msgid "Gloss Optimizer"
 msgstr "Glans forbedrer"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Lys sort"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr "Automatisk printningstilstand"
@@ -1275,11 +1324,11 @@ msgstr "Avanceret udskriftsjustering"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printretning (envejs giver højere kvalitet, men er langsommere)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr "Med/uden margin"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr "Print uden margin"
 
@@ -1409,96 +1458,97 @@ msgid "Gray Transition"
 msgstr "Grå overgang"
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+msgid "Light Gray Transition"
+msgstr "Lysgrå overgang"
+
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 msgid "Dark Gray Transition"
 msgstr "Mørkgrå overgang"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:516
 msgid "Mid Gray Transition"
 msgstr "Mellemgrå overgang"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517
 msgid "Medium Gray Transition"
 msgstr "Middelgrå overgang"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
-msgid "Light Gray Transition"
-msgstr "Lysgrå overgang"
-
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr "Brug af rødt og blåt blæk"
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr "Mængde af rødt og blåt blæk der skal bruges"
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 msgid "Full Manual Control"
 msgstr "Fuld manuel kontrol"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr "Automatisk indstillingskontrol"
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "Cd - 12 cm"
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "Cd - 8 cm"
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 msgid "Print To Hub"
 msgstr "Print til center"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manuel kontrol"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 msgid "Bidirectional"
 msgstr "Tovejs"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 msgid "Unidirectional"
 msgstr "Envejs"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr "Alternativ udfyldning"
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr "Stigende udfyldning"
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr "Aftagende udfyldning"
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr "Stigende dobbelt"
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr "Vige udenom nærmeste nabo"
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Printeren understøtter ikke en ufiltreret enheds uddata ved dybde %d\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print indstillinger ikke kontrolleret, kan ikke printe.\n"
@@ -1552,138 +1602,149 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Fire farver standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Tre farver sammensat"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Seks farver foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Fem farver foto sammensat"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Blanke film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Kuverter"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Mat papir"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Inkjetpapir"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokvalitets inkjetpapir"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Førsteklasses blankt fotopapir"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Førsteklasses glittet fotopapir"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokvalitets blankt papir"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Papir"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr "Coated"
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr "Ingen"
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 msgid "Glossy"
 msgstr "Blankt"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr "Tekstur"
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 msgid "Matte"
 msgstr "Mat"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr "Lamineret mønster"
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
 msgstr "Justér cyanbalance"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
 msgstr "Justér magentabalance"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
 msgstr "Justér gulbalance"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 msgid "Black Balance"
 msgstr "Sort balance"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
 msgstr "Justér sortbalance"
 
@@ -1763,14 +1824,6 @@ msgstr "600x600 DPI monokrom"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr "Tosidet printning"
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr "Duplex/Tumble indstilling"
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Farve + sort patroner"
@@ -1779,26 +1832,16 @@ msgstr "Farve + sort patroner"
 msgid "Color + Photo Cartridges"
 msgstr "Farve + foto patroner"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr "Afbrudt"
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr "Lang kant (standard)"
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr "Kort kant (vend)"
-
 #: src/main/print-ps.c:96
 msgid "PPDFile"
 msgstr "PPDfil"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 msgid "PPD File"
 msgstr "PPD fil"
 
@@ -1806,146 +1849,164 @@ msgstr "PPD fil"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Billedets størrelse skal passe til papirets størrelse"
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "To-niveau gråskala"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "To-niveau gråskala"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "FireTone grå"
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Seks farver forbedret sammensat"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr "Syv farver foto"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Syv farver forbedret"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Seks farver foto"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 msgid "One Color Raw"
 msgstr "En farve ufiltreret"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr "En farve ufiltreret forbedret glans"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 msgid "Two Color Raw"
 msgstr "To farver ufiltreret"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 msgid "Three Color Raw"
 msgstr "Tre farver ufiltreret"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 msgid "Three Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans "
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 msgid "Four Color Raw"
 msgstr "Fire farver ufiltreret"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 msgid "Four Color Raw Gloss"
 msgstr "Fire farver ufiltreret, glans"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 msgid "Five Color Raw"
 msgstr "Fem farver ufiltreret"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 msgid "Six Color Raw"
 msgstr "Seks farver ufiltreret"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seks farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 msgid "Seven Color Raw"
 msgstr "Syv farver ufiltreret"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Syv farver forbedret glans ufiltreret"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Seks farver ufiltreret"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr "Epson standard blæk"
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 msgid "UltraChrome Photo Black"
 msgstr "UltraChrome foto sort"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr "UltraChrome mat sort"
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Almindeligt papir hurtigindføring"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr "Baglys film"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 msgid "Matte Paper Heavyweight"
 msgstr "Heavyweight mat papir"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium silkemat fotopapir"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 msgid "ColorLife Paper"
 msgstr "ColorLife papir"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 msgid "Archival Matte Paper"
 msgstr "Arkivfast mat papir"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr "Vandfarvepapir - strålende hvidt"
 
@@ -2002,61 +2063,71 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI højeste kvalitet"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "2880 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr "Tændt"
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 msgid "Interleave"
 msgstr "Udjævning"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr "Fuld overlapning"
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr "Fire gennemløb"
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr "Fuld overlapning 2"
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 msgid "Interleave 2"
 msgstr "Udjævning 2"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 msgid "Eight Pass"
 msgstr "Otte gennemløb"
 
@@ -2745,1163 +2816,1318 @@ msgid "Canon BJC 8200"
 msgstr "Canon BJC 8200"
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+#, fuzzy
+msgid "Canon S200"
 msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:164
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 msgid "Canon PIXMA iP4000"
 msgstr "Canon PIXMA iP4000"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "EPSON Stylus C20SX"
+
+#: src/main/xmli18n-tmp.h:170
 msgid "EPSON Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "EPSON Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "EPSON Stylus C40SX"
+
+#: src/main/xmli18n-tmp.h:173
 msgid "EPSON Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 msgid "EPSON Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "EPSON Stylus C41SX"
+
+#: src/main/xmli18n-tmp.h:176
 msgid "EPSON Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 msgid "EPSON Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "EPSON Stylus C42SX"
+
+#: src/main/xmli18n-tmp.h:179
 msgid "EPSON Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 msgid "EPSON Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "EPSON Stylus C43SX"
+
+#: src/main/xmli18n-tmp.h:182
 msgid "EPSON Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 msgid "EPSON Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "EPSON Stylus C44SX"
+
+#: src/main/xmli18n-tmp.h:185
 msgid "EPSON Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 msgid "EPSON Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 msgid "EPSON Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 msgid "EPSON Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "EPSON Stylus C45"
+
+#: src/main/xmli18n-tmp.h:190
 msgid "EPSON Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 msgid "EPSON Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 msgid "EPSON Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 msgid "EPSON Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 msgid "EPSON Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 msgid "EPSON Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 msgid "EPSON Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 msgid "EPSON Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:199
 msgid "EPSON Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 msgid "EPSON Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 msgid "EPSON Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 msgid "EPSON Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 msgid "EPSON Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 msgid "EPSON Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 msgid "EPSON Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "EPSON Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 msgid "EPSON Stylus Color Pro"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 msgid "EPSON Stylus Color Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 msgid "EPSON Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 msgid "EPSON Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 msgid "EPSON Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 msgid "EPSON Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 msgid "EPSON Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 msgid "EPSON Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 msgid "EPSON Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 msgid "EPSON Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 msgid "EPSON Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 msgid "EPSON Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 msgid "EPSON Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 msgid "EPSON Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 msgid "EPSON Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 msgid "EPSON Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 msgid "EPSON Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 msgid "EPSON Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 msgid "EPSON Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 msgid "EPSON Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 msgid "EPSON Stylus Color 83"
 msgstr "EPSON Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 msgid "EPSON Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 msgid "EPSON Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 msgid "EPSON Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 msgid "EPSON Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 msgid "EPSON Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 msgid "EPSON Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 msgid "EPSON Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 msgid "EPSON Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 msgid "EPSON Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 msgid "EPSON Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 msgid "EPSON Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 msgid "EPSON Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 msgid "EPSON Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "EPSON Stylus Photo 785EPX"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 msgid "EPSON Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 msgid "EPSON Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 msgid "EPSON Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 msgid "EPSON Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 msgid "EPSON Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 msgid "EPSON Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 msgid "EPSON Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 msgid "EPSON Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 msgid "EPSON Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 msgid "EPSON Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 msgid "EPSON Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 msgid "EPSON Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 msgid "EPSON Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 msgid "EPSON Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 msgid "EPSON Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 msgid "EPSON Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 msgid "EPSON Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 msgid "EPSON Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 msgid "EPSON Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 msgid "EPSON Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 msgid "EPSON Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 msgid "EPSON Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 msgid "EPSON Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 msgid "EPSON Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "EPSON Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 msgid "EPSON Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 msgid "EPSON Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:272
 msgid "EPSON Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 msgid "EPSON Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 msgid "EPSON Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 msgid "EPSON Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 msgid "EPSON Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 msgid "EPSON Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 msgid "EPSON Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 msgid "EPSON Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 msgid "EPSON Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:282
 msgid "EPSON Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 msgid "EPSON Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:285
 msgid "EPSON Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 msgid "EPSON Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 msgid "EPSON Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 msgid "EPSON Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 msgid "EPSON Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 msgid "EPSON Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 msgid "EPSON Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 msgid "EPSON Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 msgid "EPSON Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 msgid "EPSON Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 msgid "EPSON Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 msgid "EPSON Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 msgid "EPSON Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 msgid "EPSON Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 msgid "EPSON Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 msgid "EPSON Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 msgid "EPSON Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:306
 msgid "EPSON Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:309
 msgid "EPSON Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 msgid "EPSON Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 msgid "EPSON Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 msgid "EPSON Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "EPSON Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:314
 msgid "EPSON Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 msgid "EPSON Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 msgid "EPSON Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 msgid "EPSON Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "EPSON Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "EPSON Stylus CX8300"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "EPSON Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 msgid "EPSON Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "EPSON Stylus CX3500"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr "EPSON CL-700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr "EPSON CL-750"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr "EPSON CL-760"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr "EPSON MC-2000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr "EPSON MC-7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr "EPSON MC-10000"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr "EPSON MJ-6000C"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PX-G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 msgid "EPSON PX-G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 msgid "EPSON PX-G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 msgid "EPSON PX-V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 msgid "EPSON PX-V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr "HP DeskJet 600/600C"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr "HP DeskJet 600 series"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr "HP DeskJet 690 series"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr "HP DeskJet 900 series"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr "HP DeskJet 2000 series"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr "HP DeskJet 2500 series"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr "HP LaserJet II series"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr "HP LaserJet IIP series"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr "HP LaserJet III series"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr "HP LaserJet 4 series"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr "HP LaserJet 5 series"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr "HP LaserJet 6 series"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+#, fuzzy
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Tommer"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Brug tommer som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Brug centimeter som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Points"
 msgstr "Punkter"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Brug punkter (1/72\") som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Brug millimeter som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Brug picas (1/12\") som basisenhed ved målangivelse"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Farveudskrift"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Print gråtoner med sort blæk"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Standard Command"
 msgstr "Standard kommando"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr "Brug standarddefineret printerkommando"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Custom Command"
 msgstr "Bruger kommando"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr "Anvend egendefineret printerkommando"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 msgid "Print to a file"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr "Ret kurve..."
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 msgid "Set Default"
 msgstr "Sæt som standard"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr "Genskab forrige"
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "O.k"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Annullér"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Udskriv v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -3909,7 +4135,7 @@ msgstr ""
 "    Print og\n"
 "gem opsætning"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -3917,15 +4143,15 @@ msgstr ""
 "    Gem\n"
 "opsætning"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Smugkig"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -3949,73 +4175,73 @@ msgstr ""
 "Hvis du trykker på en anden musetaste mens du trækker med musen, vil "
 "billedet returnere til dets oprindelig position."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 msgid "Paper Size"
 msgstr "Papirstørrelse"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr "Vis alle papirstørrelser"
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Størrelser:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredden af det papir der skal udskrives på"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Højde:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Højden af det papir der skal udskrives på"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Automatic Paper Size"
 msgstr "Automatisk papirstørrelse"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr "Antal kopier"
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "Vælg antal kopier; skal være mellem 1 og 100"
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 msgid "Image Position"
 msgstr "Billedposition"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Portræt"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Tværformat"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Vendt op/ned"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Tværformat vendt op/ned"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4023,119 +4249,119 @@ msgstr ""
 "Vælg papirretning: portræt, tværformat eller portræt og tværformat vendt op/"
 "ned"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Afstand fra venstre side af arket til billedet"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Højre:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Afstand fra venstre papiretkant til højre side af billedet"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Afstand fra højre papirkant til billedet"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Afstand fra toppen af arket til billedet"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Afstand fra toppen af arket til bunden af billedet"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Afstand fra den nederste kant af arket til billedet"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centrér:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 msgid "Horizontal"
 msgstr "Vandret"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centrér billedet i vandret på papiret"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centrér billedet på papiret"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 msgid "Vertical"
 msgstr "Lodret"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centrér billedet i lodret på papiret"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Indstil printer"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 msgid "Printer Make:"
 msgstr "Printer mærke:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 msgid "Select the make of your printer"
 msgstr "Vælg dit printermærke"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Printermodel:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Vælg din printermodel"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Angiv korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Bladr igennem"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Vælg korrekt PPD filnavn for printeren"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -4143,48 +4369,48 @@ msgstr ""
 "Vælg navnet på uddatakøen (hverken type eller model af printer) som du "
 "ønsker at printe til"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 msgid "Printer Queue:"
 msgstr "Printerkø:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 msgid "Enter the correct command to print to your printer. "
 msgstr "Angiv den korrekte kommando til printning på din printer. "
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr "Angiv hvilken fil du vil skrive til. "
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 msgid "File to print to"
 msgstr "Fil der skal skrives til"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 msgid "Print To File"
 msgstr "Udskriv til fil"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Definér ny printer"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Printernavn:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Angiv et navn til denne logiske printer"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 msgid "About Gutenprint "
 msgstr "Om Gutenprint"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid "Gutenprint Version "
 msgstr "Gutenprint version"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid ""
 "\n"
 "\n"
@@ -4228,11 +4454,11 @@ msgstr ""
 "med dette program. Hvis ikke, skriv da til Free Software Foundation, Inc .,\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Printer indstillinger"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4240,11 +4466,11 @@ msgstr ""
 "Vælg navnet på printeren (hverken type eller model af printer) som du ønsker "
 "at udskrive til"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Opsætning printer..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4252,11 +4478,11 @@ msgstr ""
 "Vælg printermodel, PPD fil og kommando, der skal bruges for at printe til "
 "denne printer"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Ny printer..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4264,23 +4490,23 @@ msgstr ""
 "Definer en ny logisk printer. Dette kan bruges til at navngive en samling af "
 "indstillinger, som du ønsker at huske til senere brug."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 msgid "Image Size"
 msgstr "Billedstørrelse"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Skalering:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Angiv skalering (størrelse) af billedet"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr "Skalér med:"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4288,31 +4514,31 @@ msgstr ""
 "Vælg om skalering måles i procent af valgt sidestørrelse, eller antal af "
 "udskriftspunkter pr. tomme"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Skalér udskriften til arkstørrelsen"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skalér udskriften til antal punkter pr. tomme"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Angiv bredden af udskriften"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Angiv højden på udskriften"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4320,64 +4546,64 @@ msgstr ""
 "Brug original\n"
 "billedstørrelse"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Sætter udskriftsstørrelse til størrelsen på billedet"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Udskrifts-farvejustering"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Sæt til standardværdier"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Luk"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Smugkig af billede"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr "Vis udskriftskanaler:"
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 msgid "Output"
 msgstr "Udskrift"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Udskriftstype:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Vælg den ønskede udskriftstype"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Justér udskrift..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "Justér farvebalance, lyshed, kontrast, mætning og ditherings algoritme"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 msgid "Size Units:"
 msgstr "Mål-enhed:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Enheder:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Vælg basisenhed for målangivelse ved printning"
 
@@ -4410,11 +4636,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 msgid "(Default Printer)"
 msgstr "(Standard printer)"
 
@@ -4462,60 +4688,60 @@ msgstr "Størst mulige værdi for Y"
 msgid "_Gamma value"
 msgstr "_Gamma værdi"
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 msgid "Printer Features"
 msgstr "Printer egenskaber"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 msgid "Output Control"
 msgstr "Udskriftskontrol"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 msgid "Common"
 msgstr "Almindelig"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 msgid "Extra 1"
 msgstr "Ekstra 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 msgid "Extra 2"
 msgstr "Ekstra 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 msgid "Extra 3"
 msgstr "Ekstra 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 msgid "Extra 4"
 msgstr "Ekstra 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr "Ekstra 5"
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 msgid "Gutenprint"
 msgstr "Gutenprint"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Danish"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr "Nej"
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr "Ja"
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr "Finjustering"
 
@@ -4789,18 +5015,18 @@ msgstr "Læsning fra printer overskred tidsgrænsen\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke læse fra %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åbne %s læse/skrive: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -4809,7 +5035,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -4829,82 +5055,83 @@ msgstr ""
 "Kan ikke detektere printertype.\n"
 "Brug -m for at specificere din printermodel.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
-msgstr "ukendt"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
+msgstr "Ukendt"
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr "blækniveauer"
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr "status"
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Hentning af %s kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Kan ikke identificere printeren!\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Printeren understøtter ikke listning af blæk typer!\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Blæk farve"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Procent tilbage"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Hentning af udvidede blækinformationer kræver brug af en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr "Del nummer"
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr "Dato"
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printeridentifikation forudsætter en ufiltreret enhed.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Kan ikke identificere printermodel.\n"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoveder...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Kører dyse-check, vær sikker på at der er papir i printeren.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4982,7 +5209,7 @@ msgstr ""
 "processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5055,12 +5282,12 @@ msgstr ""
 "processen løber.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Ikke i stand til at sende kommando til printeren, afbryder.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5079,19 +5306,19 @@ msgstr ""
 "Du vil så blive bedt om at bekræfte dit valg.\n"
 "Hvad vil du gøre (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr "Bekræft ved at taste 'q' igen, at du vil afbryde uden at gemme:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5100,19 +5327,19 @@ msgstr ""
 "O.k., din printer er rettet-ind, men resultatet er ikke blevet gemt.\n"
 "Hvis du ønsker at gemme, er du nødt til at gentage hele processen.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr "Bekræft ved at taste 'r' igen, at du vil gentage processen:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gentager processen med at retten-ind.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5127,17 +5354,17 @@ msgstr ""
 "Bekræft ved at taste 's' igen, at du vil gemme indstillingerne i din "
 "printer:\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Klar til at gemme indstillingerne..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "mislykkedes!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5146,27 +5373,27 @@ msgstr ""
 "Dine indstillinger blev ikke gemt korrekt. Du skal gentage retten-ind\n"
 "processen.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "lykkedes!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Dine retten-ind indstillinger er blevet gemt i printeren.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen blev ikke genkendt.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Afsluttende kommando blev ikke bekræftet.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5183,12 +5410,12 @@ msgstr ""
 "Placer et ark papir i printeren, og begynd retten-ind\n"
 "processen af print hovedet.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Tryk på enter-tasten for at fortsætte > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5198,42 +5425,42 @@ msgstr ""
 "Undersøg printet, og vælg det bedste liniepar i hvert mønster.\n"
 "Tast et par nummer, '?' for hjælp eller 'r' for at gentage processen.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Gennemløb #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Indsæt et nyt ark papir.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Antal uden for givet område!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jeg kan ikke tolke hvad du tastede!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Det bedste liniepar skulle være mellem nummer 1 og %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver at sætte retten-ind..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "lykkedes.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5247,7 +5474,7 @@ msgstr ""
 "Hvis dette ikke er tilfældet, bør du gentage processen, for at opnå den\n"
 "bedste kvalitet i printning.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Fejl i inddata\n"
@@ -5392,3 +5619,6 @@ msgstr "ERROR: ijsgutenprint: Bad parameters; cannot continue!\n"
 #, c-format
 msgid "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
 msgstr "ERROR: ijsgutenprint: Get next row failed at %.0f\n"
+
+#~ msgid "unknown"
+#~ msgstr "ukendt"
diff --git a/po/de.gmo b/po/de.gmo
index a04e67c..6dbdcf1 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index da487a7..d65f7cd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-09-05 21:20MET\n"
 "Last-Translator: Olaf Klemke <olke@users.sourceforge.net>\n"
 "Language-Team: deutsch <gnome-de@gnome.org>\n"
@@ -77,16 +77,16 @@ msgstr ""
 msgid "Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -146,313 +146,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Raster Algorythmus"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Folie"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Transferfolie"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Schreibmaschinenpapier"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Briefumschlag"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Spezialpapier"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T-Shirt Transfers"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "High Gloss Film"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Glossy Foto Papier"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Glossy Foto Karten"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Foto Papier Pro"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Anderes"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Größe"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Drucker Einstellungen"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Größe des Papiers "
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Medium Quelle"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "in welchem Schacht ist das Druckmedium"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Auflösung und Druckqualität"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tintentype"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tintenart im Drucker"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -462,78 +462,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Druckermodel:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Normalpapier"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Empfindlichkeit:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -541,18 +549,18 @@ msgstr "Stellen sie die Cyan-Balance ein"
 msgid "Light Cyan Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -560,56 +568,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "helles Magenta"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Auto-Einzug"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Handeinzug mit Pause"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Handeinzug ohne Pause"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Mattes Papier"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Schwarz"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY Farbe"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK Farbe"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Foto CcMmY Farbe"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK Farbe"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farbe"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -650,9 +678,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Drucken"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Graustufen"
 
@@ -677,114 +705,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Abbruch"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Bild Type"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Bild Type"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Helligkeit:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Einstellen der Höhe des Ausdrucks"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -794,129 +831,135 @@ msgstr ""
 "hellere Ausdrucke, kleinere dunkelere. Schwarz-Weiß bleibt gleich, nicht wie "
 "bei  der Helligkeitseinstellung."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Gelb"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Graustufen"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Farbbalance:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -925,184 +968,184 @@ msgstr ""
 "Stellen sie den Wert auf Null um einen Graustufenausdruck mit farbiger und "
 "schwarzer Tinte zu erzeugen. "
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Tintentype"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Ausgabeart:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Abbruch"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Schwarz"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Gelb"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Farbbalance:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1193,133 +1236,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Vorschub"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "autom. Auswahl"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Höhe:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Sieben Farb Foto"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "helles Magenta"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Schwarz"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gelb"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mattes Papier"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Foto Papier"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glossy Film"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Schwarz"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1389,11 +1438,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1542,106 +1591,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "helles Cyan"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Drucke in Datei?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Ausgabeart:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Größe"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Drucker unterstützt keine Rohdatenausgabe\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Ungeprüfte Druckoptionen; drucken nicht möglich.\n"
@@ -1695,144 +1745,155 @@ msgid "test print"
 msgstr "Probeausdruck"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Vier Farben Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Aus drei Farben gemischt"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Sechs Farben Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Foto aus fünf Farben gemischt "
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Umschlag"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Inkjet Papier"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Papier"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Foto Papier"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Glanz Foto Papier"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Papier"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Ilford schweres Papier"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Mattes Papier"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Stellen sie die Cyan-Balance ein"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Stellen sie die Magenta-Balance ein"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Stellen sie die Gelb-Balance ein"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Schwarz-Weiß"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Stellen sie die Cyan-Balance ein"
@@ -1913,14 +1974,6 @@ msgstr "600×600 DPI monochrome"
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Farbe+Schwarz Patrone"
@@ -1929,27 +1982,17 @@ msgstr "Farbe+Schwarz Patrone"
 msgid "Color + Photo Cartridges"
 msgstr "Farb + Foto Patronen"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD Datei:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Datei?"
@@ -1958,159 +2001,177 @@ msgstr "PPD Datei?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "zweistufig Grau"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "zweistufig Grau"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Sechs Farben Foto"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 msgid "One Color Raw"
 msgstr "einfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 msgid "Two Color Raw"
 msgstr "zweifarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 msgid "Four Color Raw"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "vierfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 msgid "Six Color Raw"
 msgstr "Sechsfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Aus sechs Farben gemischt "
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 msgid "Seven Color Raw"
 msgstr "Siebenfarbige Rohausgabe"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Aus sieben Farben gemischt"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Sechsfarbige Rohausgabe"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sechs Farben Foto"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Normalpapier Schnelleinzug"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkarte"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr "Durchlichtfolie"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Foto Papier"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Normalpapier"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mattes Papier"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2178,68 +2239,78 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI höchste Qualität"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Drucker Name:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helligkeit:"
@@ -2943,1171 +3014,1295 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "EPSON Stylus C20SX"
+msgid "Canon PIXMA iP4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "EPSON Stylus C20UX"
+msgid "EPSON Stylus C20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C40SX"
+msgid "EPSON Stylus C20SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C40UX"
+msgid "EPSON Stylus C20UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "EPSON Stylus C41SX"
+msgid "EPSON Stylus C40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C41UX"
+msgid "EPSON Stylus C40SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C42SX"
+msgid "EPSON Stylus C40UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "EPSON Stylus C42UX"
+msgid "EPSON Stylus C41"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C43SX"
+msgid "EPSON Stylus C41SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C43UX"
+msgid "EPSON Stylus C41UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "EPSON Stylus C44SX"
+msgid "EPSON Stylus C42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C44UX"
+msgid "EPSON Stylus C42SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C45"
+msgid "EPSON Stylus C42UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "EPSON Stylus C46"
+msgid "EPSON Stylus C43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C50"
+msgid "EPSON Stylus C43SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C60"
+msgid "EPSON Stylus C43UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "EPSON Stylus C61"
+msgid "EPSON Stylus C44"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C62"
+msgid "EPSON Stylus C44SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C63"
+msgid "EPSON Stylus C44UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C64"
+msgid "EPSON Stylus C45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C65"
+msgid "EPSON Stylus C46"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:189
-msgid "EPSON Stylus C66"
+msgid "EPSON Stylus C48"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C70"
+msgid "EPSON Stylus C50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C80"
+msgid "EPSON Stylus C60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C82"
+msgid "EPSON Stylus C61"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C83"
+msgid "EPSON Stylus C62"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C84"
+msgid "EPSON Stylus C63"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C85"
+msgid "EPSON Stylus C64"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C86"
+msgid "EPSON Stylus C65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus Color"
+msgid "EPSON Stylus C66"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:198
-msgid "EPSON Stylus Color Pro"
+msgid "EPSON Stylus C68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus Color Pro XL"
+msgid "EPSON Stylus C70"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus Color 400"
+msgid "EPSON Stylus C80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus Color 440"
+msgid "EPSON Stylus C82"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus Color 460"
+msgid "EPSON Stylus C83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus Color 480"
+msgid "EPSON Stylus C84"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus Color 500"
+msgid "EPSON Stylus C85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus Color 580"
+msgid "EPSON Stylus C86"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:206
-msgid "EPSON Stylus Color 600"
+msgid "EPSON Stylus C88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color 640"
+msgid "EPSON Stylus Color"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color 660"
+msgid "EPSON Stylus Color Pro"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color 670"
+msgid "EPSON Stylus Color Pro XL"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 680"
+msgid "EPSON Stylus Color 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 740"
+msgid "EPSON Stylus Color 440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 760"
+msgid "EPSON Stylus Color 460"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 777"
+msgid "EPSON Stylus Color 480"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 800"
+msgid "EPSON Stylus Color 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 850"
+msgid "EPSON Stylus Color 580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 860"
+msgid "EPSON Stylus Color 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 880"
+msgid "EPSON Stylus Color 640"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 83"
+msgid "EPSON Stylus Color 660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 900"
+msgid "EPSON Stylus Color 670"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 980"
+msgid "EPSON Stylus Color 680"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 1160"
+msgid "EPSON Stylus Color 740"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 1500"
+msgid "EPSON Stylus Color 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 1520"
+msgid "EPSON Stylus Color 777"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 3000"
+msgid "EPSON Stylus Color 800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Photo"
+msgid "EPSON Stylus Color 850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Photo 700"
+msgid "EPSON Stylus Color 860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Photo EX"
+msgid "EPSON Stylus Color 880"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Photo EX3"
+msgid "EPSON Stylus Color 83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Photo 720"
+msgid "EPSON Stylus Color 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Photo 750"
+msgid "EPSON Stylus Color 980"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Photo 780"
+msgid "EPSON Stylus Color 1160"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Photo 785EPX"
+msgid "EPSON Stylus Color 1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Photo 790"
+msgid "EPSON Stylus Color 1520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Photo 810"
+msgid "EPSON Stylus Color 3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo 820"
+msgid "EPSON Stylus Photo"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 825"
+msgid "EPSON Stylus Photo 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo 830"
+msgid "EPSON Stylus Photo EX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo 870"
+msgid "EPSON Stylus Photo EX3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 875"
+msgid "EPSON Stylus Photo 720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 890"
+msgid "EPSON Stylus Photo 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 895"
+msgid "EPSON Stylus Photo 780"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 900"
+msgid "EPSON Stylus Photo 785EPX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 915"
+msgid "EPSON Stylus Photo 790"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 925"
+msgid "EPSON Stylus Photo 810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 935"
+msgid "EPSON Stylus Photo 820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 950"
+msgid "EPSON Stylus Photo 825"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 960"
+msgid "EPSON Stylus Photo 830"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 1200"
+msgid "EPSON Stylus Photo 870"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 1270"
+msgid "EPSON Stylus Photo 875"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 1280"
+msgid "EPSON Stylus Photo 890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 1290"
+msgid "EPSON Stylus Photo 895"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 2000P"
+msgid "EPSON Stylus Photo 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 2100"
+msgid "EPSON Stylus Photo 915"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 2200"
+msgid "EPSON Stylus Photo 925"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo R200"
+msgid "EPSON Stylus Photo 935"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo R210"
+msgid "EPSON Stylus Photo 950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo R300"
+msgid "EPSON Stylus Photo 960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo R310"
+msgid "EPSON Stylus Photo 1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo RX400"
+msgid "EPSON Stylus Photo 1270"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo RX420"
+msgid "EPSON Stylus Photo 1280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo RX425"
+msgid "EPSON Stylus Photo 1290"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo RX430"
+msgid "EPSON Stylus Photo 2000P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo RX500"
+msgid "EPSON Stylus Photo 2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo RX510"
+msgid "EPSON Stylus Photo 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo RX600"
+msgid "EPSON Stylus Photo R200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:266
-msgid "EPSON Stylus Photo RX620"
+msgid "EPSON Stylus Photo R210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:267
-msgid "EPSON Stylus Photo RX630"
+msgid "EPSON Stylus Photo R220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R800"
+msgid "EPSON Stylus Photo R300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:269
-msgid "EPSON Stylus Photo R1800"
+msgid "EPSON Stylus Photo R310"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:270
-msgid "EPSON Stylus Pro 5000"
+msgid "EPSON Stylus Photo R320"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:271
-msgid "EPSON Stylus Pro 5500"
+msgid "EPSON Stylus Photo R340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:272
-msgid "EPSON Stylus Pro 7000"
+msgid "EPSON Stylus Photo RX400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:273
-msgid "EPSON Stylus Pro 7500"
+msgid "EPSON Stylus Photo RX420"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:274
-msgid "EPSON Stylus Pro 7600"
+msgid "EPSON Stylus Photo RX425"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:275
-msgid "EPSON Stylus Pro 9000"
+msgid "EPSON Stylus Photo RX430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Pro 9500"
+msgid "EPSON Stylus Photo RX500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:277
-msgid "EPSON Stylus Pro 9600"
+msgid "EPSON Stylus Photo RX510"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Pro 10000"
+msgid "EPSON Stylus Photo RX600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:279
-msgid "EPSON Stylus Scan 2000"
+msgid "EPSON Stylus Photo RX620"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:280
-msgid "EPSON Stylus Scan 2500"
+msgid "EPSON Stylus Photo RX630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:281
-msgid "EPSON Stylus CX1500"
+msgid "EPSON Stylus Photo RX700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus CX3100"
+msgid "EPSON Stylus Photo R800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:283
-msgid "EPSON Stylus CX3200"
+msgid "EPSON Stylus Photo R1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:284
-msgid "EPSON Stylus CX3500"
+msgid "EPSON Stylus Photo R2400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus CX3600"
+msgid "EPSON Stylus Pro 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus CX3650"
+msgid "EPSON Stylus Pro 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus CX4600"
+msgid "EPSON Stylus Pro 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus CX5100"
+msgid "EPSON Stylus Pro 7500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus CX5200"
+msgid "EPSON Stylus Pro 7600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus CX5300"
+msgid "EPSON Stylus Pro 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus CX5400"
+msgid "EPSON Stylus Pro 9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus CX6300"
+msgid "EPSON Stylus Pro 9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus CX6400"
+msgid "EPSON Stylus Pro 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus CX6500"
+msgid "EPSON Stylus Scan 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus CX6600"
+msgid "EPSON Stylus Scan 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:296
-msgid "EPSON Stylus CX8300"
+msgid "EPSON Stylus CX1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:297
-msgid "EPSON Stylus CX8400"
+msgid "EPSON Stylus CX3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:298
-msgid "EPSON CL-700"
+msgid "EPSON Stylus CX3200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:299
-msgid "EPSON CL-750"
+msgid "EPSON Stylus CX3500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:300
-msgid "EPSON CL-760"
+msgid "EPSON Stylus CX3600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:301
-msgid "EPSON EM-900C"
+msgid "EPSON Stylus CX3650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:302
-msgid "EPSON EM-930C"
+msgid "EPSON Stylus CX3700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:303
-msgid "EPSON MC-2000"
+msgid "EPSON Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "EPSON MC-5000"
+msgid "EPSON Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "EPSON MC-7000"
+msgid "EPSON Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "EPSON MC-9000"
+msgid "EPSON Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "EPSON MC-10000"
+msgid "EPSON Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "EPSON MJ-930C"
+msgid "EPSON Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON MJ-5100C"
+msgid "EPSON Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "EPSON MJ-6000C"
+msgid "EPSON Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "EPSON MJ-8000C"
+msgid "EPSON Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON PM-700C"
+msgid "EPSON Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON PM-730C"
+msgid "EPSON Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON PM-740C"
+msgid "EPSON Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON PM-750C"
+msgid "EPSON Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "EPSON PM-760C"
+msgid "EPSON Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "EPSON PM-770C"
+msgid "EPSON Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON PM-780C"
+msgid "EPSON Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON PM-790PT"
+msgid "EPSON Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON PM-800C"
+msgid "EPSON Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON PM-850PT"
+msgid "EPSON Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "EPSON PM-870C"
+msgid "EPSON Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "EPSON PM-880C"
+msgid "EPSON Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON PM-930C"
+msgid "EPSON Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON PM-940C"
+msgid "EPSON Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "EPSON PM-950C"
+msgid "EPSON Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "EPSON PM-970C"
+msgid "EPSON Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "EPSON PM-980C"
+msgid "EPSON CL-700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "EPSON PM-2000C"
+msgid "EPSON CL-750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "EPSON PM-2200C"
+msgid "EPSON CL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "EPSON PM-3000C"
+msgid "EPSON EM-900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "EPSON PM-3300C"
+msgid "EPSON EM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PM-3500C"
+msgid "EPSON MC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PM-3700C"
+msgid "EPSON MC-5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON PM-4000PX"
+msgid "EPSON MC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON PM-5000C"
+msgid "EPSON MC-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON PM-7000C"
+msgid "EPSON MC-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "EPSON PM-9000C"
+msgid "EPSON MJ-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON PM-10000"
+msgid "EPSON MJ-5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON PM-D750"
+msgid "EPSON MJ-6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON PM-D770"
+msgid "EPSON MJ-8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON PM-D1000"
+msgid "EPSON PM-700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON PM-G700"
+msgid "EPSON PM-730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON PM-G720"
+msgid "EPSON PM-740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON PM-G800"
+msgid "EPSON PM-750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON PM-G820"
+msgid "EPSON PM-760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON PX-G900"
+msgid "EPSON PM-770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON PX-G920"
+msgid "EPSON PM-780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON PX-G5000"
+msgid "EPSON PM-790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PX-V500"
+msgid "EPSON PM-800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PX-V600"
+msgid "EPSON PM-850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PX-7000"
+msgid "EPSON PM-870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PX-9000"
+msgid "EPSON PM-880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "Apple Color StyleWriter 4100"
+msgid "EPSON PM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "Apple Color StyleWriter 4500"
+msgid "EPSON PM-940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "Apple Color StyleWriter 6500"
+msgid "EPSON PM-950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "HP DeskJet 340"
+msgid "EPSON PM-970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "HP DeskJet 400"
+msgid "EPSON PM-980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "HP DeskJet 500"
+msgid "EPSON PM-2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "HP DesignJet 230"
+msgid "EPSON PM-2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "HP DesignJet 250C"
+msgid "EPSON PM-3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "HP DesignJet 700"
+msgid "EPSON PM-3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "HP DesignJet 750C"
+msgid "EPSON PM-3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "HP DesignJet 2500C"
+msgid "EPSON PM-3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "HP DesignJet 3500C"
+msgid "EPSON PM-4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "HP DesignJet 430"
+msgid "EPSON PM-5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "HP DesignJet 450C"
+msgid "EPSON PM-7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "HP DesignJet 455CA"
+msgid "EPSON PM-9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "HP DesignJet 488CA"
+msgid "EPSON PM-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "HP DeskJet 500C"
+msgid "EPSON PM-D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "HP DeskJet 520"
+msgid "EPSON PM-D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "HP DeskJet 540C"
+msgid "EPSON PM-D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "HP DeskJet 550C"
+msgid "EPSON PM-G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "HP DeskJet 560C"
+msgid "EPSON PM-G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "HP DeskJet 600/600C"
+msgid "EPSON PM-G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "HP DeskJet 600 series"
+msgid "EPSON PM-G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "HP DeskJet 690 series"
+msgid "EPSON PX-G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "HP DeskJet 810C"
+msgid "EPSON PX-G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "HP DeskJet 812C"
+msgid "EPSON PX-G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "HP DeskJet 840C"
+msgid "EPSON PX-V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "HP DeskJet 842C"
+msgid "EPSON PX-V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "HP DeskJet 845C"
+msgid "EPSON PX-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "HP DeskJet 850C"
+msgid "EPSON PX-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "HP DeskJet 855C"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "HP DeskJet 870C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "HP DeskJet 890C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "HP DeskJet 895C"
+msgid "HP DeskJet 340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "HP DeskJet 900 series"
+msgid "HP DeskJet 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "HP DeskJet 1100C"
+msgid "HP DeskJet 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "HP DeskJet 1120C"
+msgid "HP DesignJet 230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "HP DeskJet 1200C"
+msgid "HP DesignJet 250C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "HP DeskJet 1220C"
+msgid "HP DesignJet 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "HP DeskJet 1600C"
+msgid "HP DesignJet 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "HP DeskJet 2000 series"
+msgid "HP DesignJet 2500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "HP DeskJet 2500 series"
+msgid "HP DesignJet 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "HP PhotoSmart P1000"
+msgid "HP DesignJet 430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "HP PhotoSmart P1100"
+msgid "HP DesignJet 450C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP LaserJet II series"
+msgid "HP DesignJet 455CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP LaserJet IIP series"
+msgid "HP DesignJet 488CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP LaserJet III series"
+msgid "HP DeskJet 500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP LaserJet 4 series"
+msgid "HP DeskJet 520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP LaserJet 4L"
+msgid "HP DeskJet 540C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP LaserJet 4V"
+msgid "HP DeskJet 550C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP LaserJet 4Si"
+msgid "HP DeskJet 560C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP LaserJet 5 series"
+msgid "HP DeskJet 600/600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP LaserJet 5Si"
+msgid "HP DeskJet 600 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP LaserJet 6 series"
+msgid "HP DeskJet 690 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "Lexmark 4076"
+msgid "HP DeskJet 810C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "Lexmark Z42"
+msgid "HP DeskJet 812C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "Lexmark Z43"
+msgid "HP DeskJet 840C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "Lexmark Z52"
+msgid "HP DeskJet 842C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "Lexmark Z53"
+msgid "HP DeskJet 845C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "Olympus P10"
+msgid "HP DeskJet 850C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "Olympus P200"
+msgid "HP DeskJet 855C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "Olympus P300"
+msgid "HP DeskJet 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "Olympus P400"
+msgid "HP DeskJet 890C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "Olympus P440"
+msgid "HP DeskJet 895C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "Canon CP100"
+msgid "HP DeskJet 900 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "Canon CP220"
+msgid "HP DeskJet 1100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "Sony UP-DP10"
+msgid "HP DeskJet 1120C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "Fujifilm Printpix CX-400"
+msgid "HP DeskJet 1200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "Fujifilm Printpix CX-550"
+msgid "HP DeskJet 1220C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "RAW DATA 16 bit"
+msgid "HP DeskJet 1600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
+msgid "HP DeskJet 2000 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:425
+msgid "HP DeskJet 2500 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:426
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:427
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:428
+msgid "HP LaserJet II series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:429
+msgid "HP LaserJet IIP series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:430
+msgid "HP LaserJet III series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:431
+msgid "HP LaserJet 4 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:432
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:433
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:434
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:435
+msgid "HP LaserJet 5 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:436
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:437
+msgid "HP LaserJet 6 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Olympus P10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Olympus P200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Olympus P300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Olympus P400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Olympus P440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Canon CP100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Canon CP220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Fujifilm Printpix CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Fujifilm Printpix CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:454
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Zoll"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Die Basiseinheit auf Zentimeter einstellen"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Stelle die Basismaßeinheit auf Zoll"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Farbausgabe"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Drucke Graustufen nur mit schwarzer Tinte"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Befehl:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Datei"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drucke v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Über"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4115,7 +4310,7 @@ msgstr ""
 "Drucke und\n"
 "Sichere die Einstellungen"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4123,15 +4318,15 @@ msgstr ""
 "Sichere\n"
 "die Einstellungen"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Drucken"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4154,76 +4349,76 @@ msgstr ""
 "Das Drücken einer anderen Taste, während des Verschiebens, bringt das Bild "
 "in seine Ausgangsposition zurück."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Maße:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Breite:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Breite des Papiers"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Höhe:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Höhe des Papiers"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Aufrecht"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Querformat"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "umgekehrt Aufrecht"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4231,124 +4426,124 @@ msgstr ""
 "wählen sie die Ausrichtung: Aufrecht, Querformat, umgekehrt Aufrecht, "
 "umgekehrt Querformat"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Ausrichtung:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "links:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Entfernung vom linken Blattrand Bildrand"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "rechts:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Entfernung vom linken Blattrand zum rechten Bildrand"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Entfernung vom rechten Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Oben:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Entfernung vom oberen Blattrand zum Bildrand"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "unten:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Entfernung vom oberen Blattrand zum unteren Bildrand"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Entfernung vom unteren Blattrand zum Bild"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Zentrieren:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Waagerecht"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Bild waagerecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Beides"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Bild auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "senkrecht"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Bild senkrecht auf dem Blatt zentrieren"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Drucker einrichten"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Druckermodel:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Wählen sie ihr Druckermodel"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD Datei:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Suchen"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4357,54 +4552,54 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Wählen sie die, für ihren Drucker, richtige PPD-Datei."
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "Probeausdruck"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Drucke in Datei?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Neuen Printer einrichten"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Drucker Name:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Bitte geben sie einen Pseudonym für diesen Drucker an."
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Über Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print Version "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4452,11 +4647,11 @@ msgstr ""
 "an die Free Software Foundation, Inc., 675 Mass Ave, Cambridge,\n"
 "MA 02139, USA.\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Drucker Einstellungen"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4464,11 +4659,11 @@ msgstr ""
 "Bitte geben sie das Pseudonym des Druckers ihrer Wahl an. (kein Type, "
 "Modell...)"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Drucker einrichten..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4476,11 +4671,11 @@ msgstr ""
 "Wählen sie ein Druckermodel, eine PPD-Datei und einen Befehl zum Drucken auf "
 "diesem Drucker"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "neuer Drucker..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4488,24 +4683,24 @@ msgstr ""
 "neuer logischer Drucker. Hier können sie einer besonderen Druckereinstellung "
 "einen Namen geben und später unter diesem einfach aufrufen."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Größe"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Zoom:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Einstellung der Bildgröße"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4513,31 +4708,31 @@ msgstr ""
 "Wählen sie ob die Einstellungen in Prozent oder in Punkte per Zoll erfolgen "
 "sollen"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Prozent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Bildgröße an Seitengröße anpassen"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Wählen sie die Druckauflösung (Punkte per Zoll)"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Einstellen der Breite des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Einstellen der Höhe des Ausdrucks"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4545,68 +4740,68 @@ msgstr ""
 "Benutze originale\n"
 "Bildgröße"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Ausdruckgröße gleich Bildgröße"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Farbabstimmung"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Zurücksetzen"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Schließen"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Vorschau"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Wählen sie die gewüschte Ausgabeart:"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Ausgabeeinstellungen.."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Einstellungen für Farbalance, Helligkeit, Kontrast, Sättigung und Rasterung"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Einheiten:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Wählen sie die Basismaßeinheit für das Drucken"
 
@@ -4639,12 +4834,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Drucken"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Drucker einrichten"
@@ -4694,68 +4889,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Drucker Einstellungen"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Ausgabeart:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Befehl:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Schacht 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Schacht 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Schacht 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Schacht 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Probeausdruck"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "German"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5034,18 +5229,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Kann nicht von %s: %s lesen.\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kann %s nicht lesen/beschreiben: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kann nicht auf %s: %s schreiben.\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5054,7 +5249,7 @@ msgstr ""
 "\n"
 "Kann auf %s: %s nicht schreiben\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5072,82 +5267,83 @@ msgstr ""
 "Kann den Druckertype nicht feststellen.\n"
 "Bitte nutzen sie die -m Option um das Model mitzuteilen.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Kann die Meldungen vom Drucker nicht deuten.\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Drucker unterstützt keine Farbausgabe\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Farbtinte"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Prozent verbleibend"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Kann den Tintenstatus nur direkt von der Schnittstelle beziehen.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "Zur Druckererkennung bedarf es des Zugriffs auf die direkte Schnittstelle.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Sie sollten nur ein Druckermodell angeben."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Reinige die Köpfe...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Teste die Köpfe. Ist Papier im Drucker?\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5223,7 +5419,7 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5296,12 +5492,12 @@ msgstr ""
 "Es ist wichtigt, den Drucker während der Ausrichtung nicht Auszuschalten.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kann keinen Befehl an den Drucken senden, beende mich.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5320,13 +5516,13 @@ msgstr ""
 "Sie werden um eine Bestätigung gebeten.\n"
 "Was möchten sie tun  (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5334,7 +5530,7 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'q' das sie die Einstellungen nicht "
 "sichern möchten\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5343,7 +5539,7 @@ msgstr ""
 "Gut, Die Köpfe sind ausgerichtet aber die Einstellung noch nicht gesichert.\n"
 "Wenn sie die Sicherung wünschen, müssen sie den Prozeß wiederholen.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5352,12 +5548,12 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 'r', daß sie die Kopf-Ausrichtung\n"
 "wiederholen möchten:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Wiederhole die Kopf-Ausrichtung.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5372,17 +5568,17 @@ msgstr ""
 "Bitte bestätigen sie mit der Taste 's' , wenn sie die Einstellungen im\n"
 "Drucker sichern möchten.\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Wie man die Einstellungen sichert..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "gescheitert!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5391,27 +5587,27 @@ msgstr ""
 "Die Sicherung ihrer Einstellungen scheiterte. Sie sollten \n"
 "die Kopf-Ausrichtung wiederholen. \n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "erledigt!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Die Kopfausrichtung wurde im Drucker gespeichert.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unbekannter Befehl.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Der letzte Befehl wurde nicht bestätigt.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5427,12 +5623,12 @@ msgstr ""
 "\n"
 "Bitte legen sie ein Blatt Papier ein, um die Kopf-Ausrichtung zu beginnen.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Drücken sie Eingabe um fortzufahren > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5444,42 +5640,42 @@ msgstr ""
 "Geben sie die Nummer ein, '?' für Hilfe, oder 'r' um den Druck zu "
 "wiederholen\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Durchgang #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Bitte legen sie ein neues Blatt ein.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Die Zahl ist ungültig!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Wie bitte ?????\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Die Nummer des beßten Paares sollte zwischen 1 und %d liegen.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Beginne die Köpfe einzurichten..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "erledigt. \n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5492,7 +5688,7 @@ msgstr ""
 "mungen jeder Zeile im Muster %d sein. Wenn nicht, sollten sie diesen\n"
 "Vorgang wiederholen.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Eingabefehler\n"
diff --git a/po/el.gmo b/po/el.gmo
index 1e888ca..d4b9a87 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index ec0a72b..df228e5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2001-12-29 20:10+0000\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -80,16 +80,16 @@ msgstr ""
 msgid "Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -138,326 +138,326 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 #, fuzzy
 msgid "Plain Paper"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 #, fuzzy
 msgid "Transparencies"
 msgstr "ÄéáöáíÝò"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 #, fuzzy
 msgid "Back Print Film"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 #, fuzzy
 msgid "Fabric Sheets"
 msgstr "Åêôýðùóç Öýëëùí"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 #, fuzzy
 msgid "Envelope"
 msgstr "Åêôýðùóç ÖáêÝëïõ"
 
 #
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 #, fuzzy
 msgid "High Resolution Paper"
 msgstr "AíÜëõóç ×:"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 #, fuzzy
 msgid "T-Shirt Transfers"
 msgstr "ÌåôáöïñÜ Áñ÷åßùí"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr ""
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr ""
 
 #
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "¶ëëá"
 
 #
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 #, fuzzy
 msgid "Media Type"
 msgstr "Åßäïò MIME"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 #, fuzzy
 msgid "Media Source"
 msgstr "Áíïéêôü Ëïãéóìéêü"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "ÁíÜëõóç"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 #, fuzzy
 msgid "Ink Type"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 #, fuzzy
 msgid "Type of ink in the printer"
 msgstr "Áñ÷åßï êåéìÝíïõ ðñïò óõìðåñßëçøç óôçí áíáöïñÜ"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -467,78 +467,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "ìþâ"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Ðõêíüôçôá"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -546,18 +554,18 @@ msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 msgid "Light Cyan Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -565,63 +573,83 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 #, fuzzy
 msgid "Auto Sheet Feeder"
 msgstr "Áõôüìáôç áðüêñõøç"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 #, fuzzy
 msgid "Manual with Pause"
 msgstr "Óåëßäá åã÷åéñéäßïõ"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "×áñôß Ìáíßëá"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Ìáýñï"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 #, fuzzy
 msgid "CMY Color"
 msgstr "+ ×ñþìá"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 #, fuzzy
 msgid "CMYK Color"
 msgstr "+ ×ñþìá"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 #, fuzzy
 msgid "Photo CcMmY Color"
 msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 #, fuzzy
 msgid "Photo CcMmYK Color"
 msgstr "ÅðéëïãÞ Åéäéêïý ×ñþìáôïò"
 
 #
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "×ñþìá"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -663,9 +691,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Åêôýðùóç"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
@@ -691,432 +719,448 @@ msgid "KCMY"
 msgstr ""
 
 #
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Áêýñùóç"
 
 #
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "ÃÜììá"
 
 #
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "ÃÜììá"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Åßäïò MIME"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Åßäïò MIME"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "ÃÜììá"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Åñãáóßá"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Áíôßèåóç"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
 
 #
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "ÃÜììá"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Êõáíü"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 #, fuzzy
 msgid "Magenta"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
 #
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Êïñåóìüò:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Ôýðïò MIME"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
 #
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Áêýñùóç"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "ìþâ"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Ìáýñï"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Êßôñéíï"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
 #
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Êïñåóìüò:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1204,134 +1248,140 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Êáíïíéêü"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 #, fuzzy
 msgid "Roll Feed"
 msgstr "Ñüëïò"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
 # Revise translation of "manual" (as in opposite of "automatic", not synonym of "documentation")
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Åã÷åéñßäéï"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "ÁðåðéëïãÞ"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "¾øïò:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Êñõðôïãñáößá"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Slashdot"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Slashdot"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Ìáýñï"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Êßôñéíï"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Êåßìåíá"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 msgid "Gloss Optimizer"
 msgstr ""
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Ìáýñï"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1400,11 +1450,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1553,107 +1603,108 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "ØéëÞ Âñï÷Þ"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Byte Åîüäïõ"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "ÌÝãåèïò"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "360 DPI FOL2"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1708,146 +1759,157 @@ msgid "test print"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 #, fuzzy
 msgid "Envelopes"
 msgstr "ÐñïãñáììáôéóôÝò"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 #, fuzzy
 msgid "Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 #, fuzzy
 msgid "Photo Paper"
 msgstr "Êåßìåíá"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Ìáõ_ñüáóðñï"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Óôï êÝíôñï ôçò ïèüíçò"
@@ -1944,14 +2006,6 @@ msgstr "ìïíü÷ñùìï"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -1960,27 +2014,17 @@ msgstr ""
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr " Áñ÷åßï "
@@ -1989,165 +2033,183 @@ msgstr " Áñ÷åßï "
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Êëßìáêá ôïõ ãêñé"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Êëßìáêá ôïõ ãêñé"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Stylus Color Pro"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Slashdot"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 #, fuzzy
 msgid "Postcard"
 msgstr "Ôåëåõôáßá êáñôÝëá"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Åëáöñý ÷áëÜæé"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Êýñéá Óåëßäá"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "×áñôß Ìáíßëá"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2211,67 +2273,77 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Åñãáóßá"
@@ -3014,1328 +3086,1481 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Slashdot"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 #, fuzzy
 msgid "Inch"
 msgstr "ßíôóá"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Åêôýðùóç"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 #, fuzzy
 msgid "Color output"
 msgstr "Êýëéóç üôáí õðÜñ÷åé íÝá Ýîïäïò"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Êáíïíéêü"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "ÅíôïëÞ:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Áñ÷åßï"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "ÅíôÜîåé"
 
 #
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Áêýñùóç"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, fuzzy, c-format
 msgid "%s -- Print v%s"
 msgstr "%s Ýêäïóç %s"
 
 #
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Ðåñß"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 #, fuzzy
 msgid ""
 "Save\n"
@@ -4343,16 +4568,16 @@ msgid ""
 msgstr "ÁðïèÞêåõóç Ñõèìßóåùí"
 
 #
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Åêôýðùóç"
 
 #
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Ðñïåðéóêüðçóç"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4367,59 +4592,59 @@ msgid ""
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "ÄéáóôÜóåéò:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "ÐëÜôïò:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 #, fuzzy
 msgid "Width of the paper that you wish to print to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "¾øïò:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 #, fuzzy
 msgid "Height of the paper that you wish to print to"
 msgstr "ÅðéëÝîôå ôïí öÜêåëï ðïõ èÝëåôå íá áíïßîåôå"
 
 #
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "ÈÝóç"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Áõôüìáôï"
 
@@ -4427,215 +4652,215 @@ msgstr "Áõôüìáôï"
 # translated; if anyone knows what the term in the Greek version
 # of MSWindoze is and if it is better (or equally good), maybe we
 # would want to use that for consistency and for the sake of newbies?
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Ðïñôñáßôï"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Ïñéæüíôéïò"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 #, fuzzy
 msgid "Upside down"
 msgstr "ÁíÜðïäá"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Tïðßï"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 #, fuzzy
 msgid "Orientation:"
 msgstr "Ðñïóáíáôïëéóìüò"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "ÁñéóôåñÜ:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "ÄåîéÜ:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 #, fuzzy
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "ÐÜíù:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "ÊÜôù:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 #, fuzzy
 msgid "Center:"
 msgstr "ÊÝíôñï"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "_Ïñéæüíôéá"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Êáé ôá äýï"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 #, fuzzy
 msgid "Center the image on the paper"
 msgstr "ÁëëáãÞ ôïõ ìåãÝèïõò óåëßäáò"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Êáôáêüñõ_öá"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 #, fuzzy
 msgid "Center the image vertically on the paper"
 msgstr "ÐåñéóôñïöÞ åéêüíáò ãéá êÜèåôá ôáìðëþ"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
 #
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 #, fuzzy
 msgid "Printer Model:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
 #
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 #, fuzzy
 msgid "Select your printer model"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 #, fuzzy
 msgid "PPD File:"
 msgstr "Áñ÷åßï Ôáõôüôçôáò Äéåñãáóßáò: "
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Åîåñåýíçóç"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Åêôýðùóç óå Áñ÷åßï"
 
 #
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 #, fuzzy
 msgid "Define New Printer"
 msgstr "ÅðéëïãÞ åêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 #, fuzzy
 msgid "Printer Name:"
 msgstr "¼íïìá åêôõðùôÞ:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 #, fuzzy
 msgid "Enter the name you wish to give this logical printer"
 msgstr "ÅéóÜãåôå ôïí áñéèìü ãñáììÞò óôïí ïðïßï èÝëåôå íá ðÜôå."
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Óçìåßï ÐñïóÜñôçóçò: "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Åêôýðùóç óå: "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid ""
 "\n"
 "\n"
@@ -4659,171 +4884,171 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 #, fuzzy
 msgid "Printer Settings"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 #, fuzzy
 msgid "Setup Printer..."
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 #, fuzzy
 msgid "New Printer..."
 msgstr "Åêôýðùóç..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
 #
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 #, fuzzy
 msgid "Scaling:"
 msgstr "ÁðïèÞêåõóç:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 #, fuzzy
 msgid "Set the scale (size) of the image"
 msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Ðïóïóôü"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 #, fuzzy
 msgid "Scale the print to the size of the page"
 msgstr "ÅëÜôôùóç ôïõ ìåãÝèïõò ôçò åéêüíáò óôï ìéóü"
 
 #
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 #, fuzzy
 msgid "PPI"
 msgstr "ÁÑÉÈÌ.ÄÉÅÑÃÁÓÉÁÓ"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 #, fuzzy
 msgid "Set the width of the print"
 msgstr "Ôï ðëÜôïò ôïõ ìáñáöåôéïý"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 #, fuzzy
 msgid "Set the height of the print"
 msgstr "Åóôßáóç ãéá ðñïóáñìïãÞ ôïõ ýøïõò ôçò óåëßäáò"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 #, fuzzy
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr "Áñ÷éêü _ÌÝãåèïò"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 #, fuzzy
 msgid "Set the print size to the size of the image"
 msgstr "Ïñéóìüò ðáñáìåôñïðïéçìÝíïõ ìåãÝèïõò ãéá ôçí åéêüíá"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 #, fuzzy
 msgid "Print Color Adjust"
 msgstr "Ðñùôåýùíôá ×ñþìáôá"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 #, fuzzy
 msgid "Set Defaults"
 msgstr "Ïñéóìüò ÐñïêáèïñéóìÝíùí Ôéìþí"
 
 #
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Êëåßóéìï"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 #, fuzzy
 msgid "Image preview"
 msgstr "ÐáñáôçñçôÞò Åéêüíùí"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Byte Åîüäïõ"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 #, fuzzy
 msgid "Output Type:"
 msgstr "Byte Åîüäïõ"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 #, fuzzy
 msgid "Select the desired output type"
 msgstr "ÅðéëïãÞ áñ÷åßïõ ðñïò áðïèÞêåõóç"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "&ÌïíÜäåò:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 #, fuzzy
 msgid "Units:"
 msgstr "&ÌïíÜäåò:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 #, fuzzy
 msgid "Select the base unit of measurement for printing"
 msgstr "ÅðéëÝãåé ãñáììáôïóåéñÝò ãéá åðéêüëëçóç"
@@ -4858,12 +5083,12 @@ msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
 #
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Åêôýðùóç"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Ñýèìéóç ÅêôõðùôÞ"
@@ -4913,70 +5138,70 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ñõèìßóåéò ÅðéëïãÝá"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Byte Åîüäïõ"
 
 #
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "ÅíôïëÞ:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "ÄïêéìÞ"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Ôßôëïé ðñïò åêôýðùóç"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Greek"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 #, fuzzy
 msgid "ISOLatin1"
 msgstr "ËÜôéí"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5156,25 +5381,25 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Äåí åßíáé äõíáôü íá åëåã÷èåß ï öÜêåëïò: %s: %s"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, fuzzy, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "¶íïéãìá áñ÷åßïõ %s áäýíáôïí\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, fuzzy, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr "ÅããñáöÞ áäýíáôç: %s"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5189,83 +5414,84 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Áäõíáìßá áíïßãìáôïò áñ÷åßïõ åîüäïõ: %s\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 #, fuzzy
 msgid "Ink color"
 msgstr " ÷ñþìá"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 #, fuzzy
 msgid "Percent remaining"
 msgstr "Åðß ôïéò åêáôü åëåýèåñï"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Ìðïñåßôå íá áðïèçêåýóåôå ìéá ìüíï äéåýèõíóç ôç öïñÜ.\n"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, fuzzy, c-format
 msgid "Cleaning heads...\n"
 msgstr "ÁíÜãíùóç åðéêåöáëßäùí..."
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5304,7 +5530,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5340,12 +5566,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5357,38 +5583,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, fuzzy, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5398,44 +5624,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, fuzzy, c-format
 msgid "Unrecognized command.\n"
 msgstr "Üãíùóôï ÷ñþìá: %s"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5446,13 +5672,13 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 #, fuzzy
 msgid "Press enter to continue > "
 msgstr "Ðáñáêáëþ åéóáãÜãåôå ìéá ãñáììÞ åíôïëþí ðáñáêÜôù."
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5460,43 +5686,43 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
 #
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, fuzzy, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Ðáñáêáëþ åéóÜãåôå 200 äñá÷ìÝò ãéá íá óõíå÷ßóåôå."
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, fuzzy, c-format
 msgid "Number out of range!\n"
 msgstr "Áñéèìüò Óåëßäùí"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, fuzzy, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Äåí êáôáëáâáßíù ôçí åíôïëÞ óïõ. "
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, fuzzy, c-format
 msgid "Attempting to set alignment..."
 msgstr "Åêêßíçóç ôùí ¸îõðíùí ÅéóáãùãÝùí"
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5505,7 +5731,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, fuzzy, c-format
 msgid "Error in input\n"
 msgstr "ÓöÜëìá ðñïóèÞêçò ëßóôáò"
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 2333d68..b0459a4 100644
--- a/po/en_GB.gmo
+++ b/po/en_GB.gmo
diff --git a/po/en_GB.po b/po/en_GB.po
index e5ace51..f5b5aff 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2004-09-23 00:10+0100\n"
 "Last-Translator: Roger Leigh <rleigh@debian.org>\n"
 "Language-Team: British English\n"
@@ -72,16 +72,16 @@ msgstr "Predithered Input"
 msgid "Density"
 msgstr "Density"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -141,284 +141,284 @@ msgstr "Colour conversion module"
 msgid "Dither algorithm"
 msgstr "Dither algorithm"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI"
 msgstr "90×90 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI DMT"
 msgstr "90×90 DPI DMT"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI"
 msgstr "180×180 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI DMT"
 msgstr "180×180 DPI DMT"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI"
 msgstr "360×360 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI DMT"
 msgstr "360×360 DPI DMT"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI"
 msgstr "720×360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI DMT"
 msgstr "720×360 DPI DMT"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI"
 msgstr "720×720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI DMT"
 msgstr "720×720 DPI DMT"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI"
 msgstr "1440×720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI DMT"
 msgstr "1440×720 DPI DMT"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI DMT"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI DMT"
 msgstr "2880×2880 DPI DMT"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI DMT"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI DMT"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI DMT"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI DMT"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI DMT"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI"
 msgstr "1200×1200 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI DMT"
 msgstr "1200×1200 DPI DMT"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI"
 msgstr "2400×2400 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI DMT"
 msgstr "2400×2400 DPI DMT"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Plain Paper"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Plain Paper"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Transparencies"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Back Print Film"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Fabric Sheets"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Envelope"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "High Resolution Paper"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T-Shirt Transfers"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "High Gloss Film"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Glossy Photo Paper"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Glossy Photo Cards"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Photo Paper Pro"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Other"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr "Page Size"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 msgid "Basic Printer Setup"
 msgstr "Basic Printer Setup"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr "Size of the paper being printed to"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Media Type"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "Type of media (plain paper, photo paper, etc.)"
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Media Source"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr "Source (input slot) of the media"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Resolution"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolution and quality of the print"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Ink Type"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "Advanced Printer Setup"
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type of ink in the printer"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr "Ink Channels"
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -428,149 +428,177 @@ msgstr "Ink Channels"
 msgid "Advanced Printer Functionality"
 msgstr "Advanced Printer Functionality"
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "Printing Mode"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr "Core Parameter"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr "Printing Output Mode"
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr "Double-Sided Printing"
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr "Duplex/Tumble Setting"
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Density"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta Curve"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Density"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Density"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Adjust the black balance"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr "Light Cyan Transition"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr "Advanced Ink Adjustment"
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr "Light Magenta Transition"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 msgid "Light Yellow Transition"
 msgstr "Light Yellow Transition"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr "Off"
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr "Short Edge (Flip)"
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Auto Sheet Feeder"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manual with Pause"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manual without Pause"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Matte Paper"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Black"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY Colour"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK Colour"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Photo CcMmY Colour"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Photo CcMmYK Colour"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Colour"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -608,9 +636,9 @@ msgstr "Raw"
 msgid "Pre-Dithered"
 msgstr "Pre-Dithered"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Grayscale"
 
@@ -635,103 +663,112 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 msgid "Channel "
 msgstr "Channel "
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 msgid " Gamma"
 msgstr " Gamma"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr "Gamma for raw channel "
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr "Colour Correction"
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr "Basic Image Adjustment"
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr "Colour correction to be applied"
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr "Channel Bit Depth"
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr "Bit depth per channel"
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 msgid "Input Image Type"
 msgstr "Input Image Type"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 msgid "Input image type"
 msgstr "Input image type"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 msgid "Output Image Type"
 msgstr "Output Image Type"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 msgid "Output image type"
 msgstr "Output image type"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr "Raw Channels"
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "AppGamma"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 msgid "Brightness"
 msgstr "Brightness"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 msgid "Brightness of the print"
 msgstr "Brightness of the print"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 msgid "Contrast"
 msgstr "Contrast"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr "Contrast of the print (0 is solid gray)"
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr "Linear Contrast Adjustment"
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Advanced Image Control"
 msgstr "Advanced Image Control"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr "Use linear vs. fixed end point contrast adjustment"
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr "Composite Gamma"
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
@@ -739,118 +776,124 @@ msgstr ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 msgid "AppGamma"
 msgstr "AppGamma"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr "Gamma value assumed by application"
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
 msgstr "Adjust the cyan gamma"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
 msgstr "Adjust the magenta gamma"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Yellow"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr "Adjust the yellow gamma"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr "Red"
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 msgid "Adjust the red gamma"
 msgstr "Adjust the red gamma"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr "Green"
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 msgid "Adjust the green gamma"
 msgstr "Adjust the green gamma"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr "Blue"
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
 msgstr "Adjust the blue gamma"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "Adjust the black gamma"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr "Cyan Balance"
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Grayscale"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 msgid "Magenta Balance"
 msgstr "Magenta Balance"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 msgid "Yellow Balance"
 msgstr "Yellow Balance"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 msgid "Saturation"
 msgstr "Saturation"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -858,164 +901,164 @@ msgstr ""
 "Adjust the saturation (colour balance) of the print\n"
 "Use zero saturation to produce grayscale output using colour and black inks"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 msgid "Ink Limit"
 msgstr "Ink Limit"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr "Advanced Output Control"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr "Limit the total ink printed to the page"
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr "GCR Transition"
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr "Adjust the gray component transition rate"
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr "GCR Lower Bound"
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr "Lower bound of gray component reduction"
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr "GCR Upper Bound"
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr "Upper bound of gray component reduction"
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 msgid " Curve"
 msgstr " Curve"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 msgid "Output Curves"
 msgstr "Output Curves"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr "Curve for raw channel "
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr "Cyan Curve"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 msgid "Cyan curve"
 msgstr "Cyan curve"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 msgid "Magenta Curve"
 msgstr "Magenta Curve"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 msgid "Magenta curve"
 msgstr "Magenta curve"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 msgid "Yellow Curve"
 msgstr "Yellow Curve"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 msgid "Yellow curve"
 msgstr "Yellow curve"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 msgid "Black Curve"
 msgstr "Black Curve"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 msgid "Black curve"
 msgstr "Black curve"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 msgid "Red Curve"
 msgstr "Red Curve"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 msgid "Red curve"
 msgstr "Red curve"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 msgid "Green Curve"
 msgstr "Green Curve"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 msgid "Green curve"
 msgstr "Green curve"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 msgid "Blue Curve"
 msgstr "Blue Curve"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 msgid "Blue curve"
 msgstr "Blue curve"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 msgid "White Curve"
 msgstr "White Curve"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 msgid "White curve"
 msgstr "White curve"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr "Hue Map"
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr "Advanced HSL Curves"
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr "Hue adjustment curve"
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 msgid "Saturation Map"
 msgstr "Saturation Map"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr "Saturation adjustment curve"
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr "Luminosity Map"
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr "Luminosity adjustment curve"
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr "Gray Component Reduction"
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr "Gray component reduction curve"
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr "Traditional Gutenprint colour conversion"
 
@@ -1107,125 +1150,131 @@ msgstr ""
 "Image is too long for the page: top margin is %d, height %d, bottom edge is %"
 "d\n"
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Roll Feed"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr "Roll Feed (cut each page)"
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr "Roll Feed (do not cut)"
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 msgid "Manual Feed"
 msgstr "Manual Feed"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 msgid "Print to CD"
 msgstr "Print to CD"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr "Cut Sheet Bin 1"
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr "Cut Sheet Bin 2"
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 msgid "Cut Sheet Autoselect"
 msgstr "Cut Sheet Autoselect"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr "Manual Selection"
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr "Fast Economy"
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr "Economy"
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr "Draft"
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 msgid "High"
 msgstr "High"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "Photo"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr "Super Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr "Ultra Photo"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr "Best"
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Light Cyan/Red"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Light Magenta/Blue"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Black"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Black/Dark Yellow"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matte Paper"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Photo Paper"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 msgid "Gloss Optimizer"
 msgstr "Gloss Optimiser"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Black"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr "Automatic Printing Mode"
@@ -1292,11 +1341,11 @@ msgstr "Advanced Output Adjustment"
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr "Printing direction (unidirectional is higher quality, but slower)"
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr "Borderless"
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr "Print without borders"
 
@@ -1443,96 +1492,97 @@ msgid "Gray Transition"
 msgstr "Gray Transition"
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+msgid "Light Gray Transition"
+msgstr "Light Gray Transition"
+
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 msgid "Dark Gray Transition"
 msgstr "Dark Gray Transition"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:516
 msgid "Mid Gray Transition"
 msgstr "Mid Gray Transition"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517
 msgid "Medium Gray Transition"
 msgstr "Medium Gray Transition"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
-msgid "Light Gray Transition"
-msgstr "Light Gray Transition"
-
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 msgid "Full Manual Control"
 msgstr "Full Manual Control"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr "Automatic Setting Control"
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "CD - 5 inch"
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "CD - 3 inch"
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr "Normal"
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 msgid "Print To Hub"
 msgstr "Print To Hub"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr "Manual Control"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 msgid "Automatic"
 msgstr "Automatic"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 msgid "Bidirectional"
 msgstr "Bidirectional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 msgid "Unidirectional"
 msgstr "Unidirectional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr "Alternate Fill"
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr "Ascending Fill"
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr "Descending Fill"
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr "Ascending Double"
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr "Nearest Neighbour Avoidance"
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "This printer does not support raw printer output at depth %d\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr "Print options not verified; cannot print.\n"
@@ -1586,141 +1636,152 @@ msgid "test print"
 msgstr "test print"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Four Colour Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Three Colour Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Six Colour Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Five Colour Photo Composite"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Glossy Film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Inkjet Paper"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Photo Quality Inkjet Paper"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Photo Paper"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Lustre Photo Paper"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Photo Quality Glossy Paper"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 #, fuzzy
 msgid "Coated"
 msgstr "Card"
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr "None"
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Glossy Film"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Matte Paper"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
 msgstr "Adjust the cyan balance"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
 msgstr "Adjust the magenta balance"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
 msgstr "Adjust the yellow balance"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 msgid "Black Balance"
 msgstr "Black Balance"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
 msgstr "Adjust the black balance"
 
@@ -1800,14 +1861,6 @@ msgstr "600×600 DPI monochrome"
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr "Double-Sided Printing"
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr "Duplex/Tumble Setting"
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Colour + Black Cartridges"
@@ -1816,26 +1869,16 @@ msgstr "Colour + Black Cartridges"
 msgid "Color + Photo Cartridges"
 msgstr "Colour + Photo Cartridges"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr "Off"
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr "Long Edge (Standard)"
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr "Short Edge (Flip)"
-
 #: src/main/print-ps.c:96
 msgid "PPDFile"
 msgstr "PPDFile"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 msgid "PPD File"
 msgstr "PPD File"
 
@@ -1843,161 +1886,179 @@ msgstr "PPD File"
 msgid "Image dimensions must match paper dimensions"
 msgstr "Image dimensions must match paper dimensions"
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Grayscale"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Grayscale"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 #, fuzzy
 msgid "Six Color Enhanced Composite"
 msgstr "Five Colour Photo Composite"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Six Colour Photo"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Six Colour Photo"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Colour Composite"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Colour Composite"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Colour Standard"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Colour Standard"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Colour Photo"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Six Colour Photo"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Ultra Photo"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Plain Paper"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postcard"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Back Print Film"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matte Paper"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium Glossy Photo Paper"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Core Parameter"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte Paper"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2067,68 +2128,78 @@ msgstr "1440×720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI highest quality"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440×720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI highest quality"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440×1440 DPI DMT"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440×1440 DPI DMT"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880×2880 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Interleave Method"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Interleave Method"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Alignment Passes"
@@ -2824,1198 +2895,1353 @@ msgid "Canon BJC 8200"
 msgstr "Canon BJC 8200"
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+#, fuzzy
+msgid "Canon S200"
 msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:164
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "EPSON Stylus C20SX"
+
+#: src/main/xmli18n-tmp.h:170
 msgid "EPSON Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "EPSON Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "EPSON Stylus C40SX"
+
+#: src/main/xmli18n-tmp.h:173
 msgid "EPSON Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 msgid "EPSON Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "EPSON Stylus C41SX"
+
+#: src/main/xmli18n-tmp.h:176
 msgid "EPSON Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 msgid "EPSON Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "EPSON Stylus C42SX"
+
+#: src/main/xmli18n-tmp.h:179
 msgid "EPSON Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 msgid "EPSON Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "EPSON Stylus C43SX"
+
+#: src/main/xmli18n-tmp.h:182
 msgid "EPSON Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 msgid "EPSON Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "EPSON Stylus C44SX"
+
+#: src/main/xmli18n-tmp.h:185
 msgid "EPSON Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 msgid "EPSON Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 msgid "EPSON Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 msgid "EPSON Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "EPSON Stylus C45"
+
+#: src/main/xmli18n-tmp.h:190
 msgid "EPSON Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 msgid "EPSON Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 msgid "EPSON Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 msgid "EPSON Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 msgid "EPSON Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 msgid "EPSON Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 msgid "EPSON Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 msgid "EPSON Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:199
 msgid "EPSON Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 msgid "EPSON Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 msgid "EPSON Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 msgid "EPSON Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 msgid "EPSON Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 msgid "EPSON Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 msgid "EPSON Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "EPSON Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 msgid "EPSON Stylus Color Pro"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 msgid "EPSON Stylus Color Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 msgid "EPSON Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 msgid "EPSON Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 msgid "EPSON Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 msgid "EPSON Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 msgid "EPSON Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 msgid "EPSON Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 msgid "EPSON Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 msgid "EPSON Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 msgid "EPSON Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 msgid "EPSON Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 msgid "EPSON Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 msgid "EPSON Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 msgid "EPSON Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 msgid "EPSON Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 msgid "EPSON Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 msgid "EPSON Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 msgid "EPSON Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 msgid "EPSON Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 msgid "EPSON Stylus Color 83"
 msgstr "EPSON Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 msgid "EPSON Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 msgid "EPSON Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 msgid "EPSON Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 msgid "EPSON Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 msgid "EPSON Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 msgid "EPSON Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 msgid "EPSON Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 msgid "EPSON Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 msgid "EPSON Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 msgid "EPSON Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 msgid "EPSON Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 msgid "EPSON Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 msgid "EPSON Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "EPSON Stylus Photo 785EPX"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 msgid "EPSON Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 msgid "EPSON Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 msgid "EPSON Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 msgid "EPSON Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 msgid "EPSON Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 msgid "EPSON Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 msgid "EPSON Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 msgid "EPSON Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 msgid "EPSON Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 msgid "EPSON Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 msgid "EPSON Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 msgid "EPSON Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 msgid "EPSON Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 msgid "EPSON Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 msgid "EPSON Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 msgid "EPSON Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 msgid "EPSON Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 msgid "EPSON Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 msgid "EPSON Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 msgid "EPSON Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 msgid "EPSON Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 msgid "EPSON Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 msgid "EPSON Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "EPSON Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 msgid "EPSON Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 msgid "EPSON Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 msgid "EPSON Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX500"
+
+#: src/main/xmli18n-tmp.h:282
 msgid "EPSON Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:285
 msgid "EPSON Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 msgid "EPSON Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 msgid "EPSON Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 msgid "EPSON Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 msgid "EPSON Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 msgid "EPSON Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 msgid "EPSON Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 msgid "EPSON Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 msgid "EPSON Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 msgid "EPSON Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 msgid "EPSON Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "EPSON Stylus CX-3200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "EPSON Stylus CX-8300"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "EPSON Stylus CX-3100"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "EPSON Stylus CX-3100"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "EPSON Stylus CX-3100"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "EPSON Stylus CX-3100"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "EPSON Stylus CX-3200"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "EPSON Stylus CX-8400"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "EPSON Stylus CX-8400"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "EPSON Stylus CX-5100"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "EPSON Stylus CX-5200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "EPSON Stylus CX-5300"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "EPSON Stylus CX-5400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "EPSON Stylus CX-3100"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "EPSON Stylus CX-6300"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "EPSON Stylus CX-6400"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "EPSON Stylus CX-8300"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "EPSON Stylus CX-6600"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "EPSON Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "EPSON Stylus CX-8300"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "EPSON Stylus CX-8300"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "EPSON Stylus CX-8400"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "EPSON Stylus CX-3100"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "EPSON Stylus CX-3100"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "EPSON Stylus CX-3200"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "EPSON Stylus CX-8400"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr "EPSON CL-700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr "EPSON CL-750"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr "EPSON CL-760"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr "EPSON MC-2000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr "EPSON MC-7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr "EPSON MC-10000"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr "EPSON MJ-6000C"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 msgid "EPSON PX-V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 msgid "EPSON PX-V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Colour StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Colour StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Colour StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr "HP DeskJet 600/600C"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr "HP DeskJet 600 series"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr "HP DeskJet 690 series"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr "HP DeskJet 900 series"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr "HP DeskJet 2000 series"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr "HP DeskJet 2500 series"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr "HP LaserJet II series"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr "HP LaserJet IIP series"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr "HP LaserJet III series"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr "HP LaserJet 4 series"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr "HP LaserJet 5 series"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr "HP LaserJet 6 series"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+#, fuzzy
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr "RAW DATA 16 bit"
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr "RAW DATA 8 bit"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Inch"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Set the base unit of measurement to inches"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Set the base unit of measurement to centimetres"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Points"
 msgstr "Points"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Set the base unit of measurement to points (1/72\")"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr "mm"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Set the base unit of measurement to millimetres"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr "Pica"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Set the base unit of measurement to picas (1/12\")"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Colour output"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Print in shades of gray using black ink"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Standard Command"
 msgstr "Standard Command"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr "Use standard print command"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Custom Command"
 msgstr "Custom Command"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr "Use custom print command"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "File"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 msgid "Print to a file"
 msgstr "Print to a file"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr "Edit Curve..."
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 msgid "Set Default"
 msgstr "Set Default"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr "Restore Previous"
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "About"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4023,7 +4249,7 @@ msgstr ""
 "Print and\n"
 "Save Settings"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4031,15 +4257,15 @@ msgstr ""
 "Save\n"
 "Settings"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Print"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Preview"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4063,73 +4289,73 @@ msgstr ""
 "If you click another button while dragging the mouse, the image will return "
 "to its original position."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 msgid "Paper Size"
 msgstr "Paper Size"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr "Show All Paper Sizes"
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Dimensions:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Width:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Width of the paper that you wish to print to"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Height:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Height of the paper that you wish to print to"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Automatic Paper Size"
 msgstr "Automatic Paper Size"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 msgid "Image Position"
 msgstr "Image Position"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Landscape"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Upside down"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Seascape"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4137,119 +4363,119 @@ msgstr ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientation:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Left:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Distance from the left of the paper to the image"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Right:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Distance from the left of the paper to the right of the image"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Distance from the right of the paper to the image"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Top:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Distance from the top of the paper to the image"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Bottom:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Distance from the top of the paper to bottom of the image"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distance from the bottom of the paper to the image"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centre:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centre the image horizontally on the paper"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Both"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centre the image on the paper"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centre the image vertically on the paper"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Setup Printer"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 msgid "Printer Make:"
 msgstr "Printer Make:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 msgid "Select the make of your printer"
 msgstr "Select the make of your printer"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Printer Model:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Select your printer model"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD File:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Enter the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Browse"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choose the correct PPD filename for your printer"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
@@ -4257,48 +4483,48 @@ msgstr ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 msgid "Printer Queue:"
 msgstr "Printer Queue:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 msgid "Enter the correct command to print to your printer. "
 msgstr "Enter the correct command to print to your printer. "
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr "Enter the file to print to. "
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 msgid "File to print to"
 msgstr "File to print to"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 msgid "Print To File"
 msgstr "Print To File"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Define New Printer"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Printer Name:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Enter the name you wish to give this logical printer"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 msgid "About Gutenprint "
 msgstr "About Gutenprint "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid "Gutenprint Version "
 msgstr "Gutenprint Version "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid ""
 "\n"
 "\n"
@@ -4342,11 +4568,11 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Printer Settings"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4354,11 +4580,11 @@ msgstr ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Setup Printer..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4366,11 +4592,11 @@ msgstr ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "New Printer..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4378,23 +4604,23 @@ msgstr ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 msgid "Image Size"
 msgstr "Image Size"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Scaling:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Set the scale (size) of the image"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4402,31 +4628,31 @@ msgstr ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Percent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Scale the print to the size of the page"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Scale the print to the number of dots per inch"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Set the width of the print"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Set the height of the print"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4434,65 +4660,65 @@ msgstr ""
 "Use Original\n"
 "Image Size"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Set the print size to the size of the image"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Print Colour Adjust"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Set Defaults"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Close"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Image preview"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr "View Output Channels:"
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 msgid "Output"
 msgstr "Output"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Output Type:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Select the desired output type"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Adjust Output..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Adjust colour balance, brightness, contrast, saturation, and dither algorithm"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 msgid "Size Units:"
 msgstr "Size Units:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 msgid " "
 msgstr " "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Units:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Select the base unit of measurement for printing"
 
@@ -4525,11 +4751,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 msgid "Printer"
 msgstr "Printer"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 msgid "(Default Printer)"
 msgstr "(Default Printer)"
 
@@ -4578,60 +4804,60 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 msgid "Printer Features"
 msgstr "Printer Features"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 msgid "Output Control"
 msgstr "Output Control"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 msgid "Common"
 msgstr "Common"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 msgid "Extra 1"
 msgstr "Extra 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 msgid "Extra 2"
 msgstr "Extra 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 msgid "Extra 3"
 msgstr "Extra 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 msgid "Extra 4"
 msgstr "Extra 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr "Extra 5"
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 msgid "Gutenprint"
 msgstr "Gutenprint"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "English-GB"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "UTF-8"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr "No"
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr "Yes"
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr "Fine Adjustment"
 
@@ -4895,18 +5121,18 @@ msgstr "Read from printer timed out\n"
 msgid "Cannot read from %s: %s\n"
 msgstr "Cannot read from %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Cannot open %s read/write: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -4915,7 +5141,7 @@ msgstr ""
 "\n"
 "Cannot write to %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -4933,82 +5159,83 @@ msgstr ""
 "Cannot detect printer type.\n"
 "Please use -m to specify your printer model.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Obtaining ink levels requires using a raw device.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Cannot parse output from printer\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "This printer does not support raw printer output at depth %d\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Ink colour"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Percent remaining"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Obtaining ink levels requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 #, fuzzy
 msgid "Date"
 msgstr "Draft"
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Printer identification requires using a raw device.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "You may only specify one printer model."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Cleaning heads...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Running nozzle check, please ensure paper is in the printer.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5081,7 +5308,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5148,12 +5375,12 @@ msgstr ""
 "this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Unable to send command to the printer, exiting.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5172,20 +5399,20 @@ msgstr ""
 "You will then be asked to confirm your choice.\n"
 "What do you want to do (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5194,7 +5421,7 @@ msgstr ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5203,12 +5430,12 @@ msgstr ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repeating the alignment process.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5223,17 +5450,17 @@ msgstr ""
 "Please confirm by typing 's' again that you wish to save the settings\n"
 "to your printer:\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "About to save settings..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "failed!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5242,27 +5469,27 @@ msgstr ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "succeeded!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Your alignment settings have been saved to the printer.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Unrecognised command.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Final command was not confirmed.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5279,12 +5506,12 @@ msgstr ""
 "Please place a sheet of paper in your printer to begin the head\n"
 "alignment procedure.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Press enter to continue > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5295,42 +5522,42 @@ msgstr ""
 "pattern.\n"
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Please insert a fresh sheet of paper.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Number out of range!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "I cannot understand what you typed!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "The best pair of lines should be numbered between 1 and %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Attempting to set alignment..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "succeeded.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5343,7 +5570,7 @@ msgstr ""
 "pattern %d.  If it is not, you should repeat the process to get the best\n"
 "quality printing.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Error in input\n"
diff --git a/po/es.gmo b/po/es.gmo
index f922adf..d852f17 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 0aa752f..bb35986 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-04-29 00:38GMT\n"
 "Last-Translator: Gustavo D. Vranjes <gvranjes@abaconet.com.ar>\n"
 "Language-Team: Castellano <es@li.org>\n"
@@ -78,16 +78,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densidad:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -148,313 +148,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmo de Entramado"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 PPP"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 PPP"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 PPP"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 PPP"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 PPP"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 PPP MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 PPP"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 PPP"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 PPP"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 PPP"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 PPP"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 PPP"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 PPP"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 PPP"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 PPP"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 PPP"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 PPP"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 PPP"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 PPP"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Transparencias"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Película para Imprimir por Atrás"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Hojas de Tela"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Sobre"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Papel de Alta Resolución"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "Transferencias a Remeras"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Película de Alto Brillo"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Papel Brillante de Fotografía"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Tarjetas Brillantes de Fotografía"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Papel de Fotografía Profesional"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Otro"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamaño"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Configuración de la Impresora"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamaño del papel al que desea imprimir"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Tipo de Medio"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Fuente de Medio"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Origen del medio (ranura de entrada) al que está imprimiendo"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolución y calidad de la impresión"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta de la impresora"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,78 +464,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo de Impresora:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel Común"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidad:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -543,18 +551,18 @@ msgstr "Ajustar el balance de cian de la impresión"
 msgid "Light Cyan Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -562,56 +570,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Autoalimentador de Hojas"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manual con Pausa"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manual sin Pausa"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Papel Opaco"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Negro"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "Color CMY (Cian/Mag/Amar)"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "Color CMYK (Cian/Mag/Amar/Negro)"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Color CcMmY para Fotografía"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Color CcMmYK para Fotografía"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Color"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -652,9 +680,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Tonos de gris"
 
@@ -679,114 +707,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Cancelar"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Tipo de imagen"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Tipo de imagen"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Brillo:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Establecer el alto de la impresión"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Contraste:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -797,129 +834,135 @@ msgstr ""
 "generalmente una impresión más oscura. Negro y blanco permanecerán iguales, "
 "distinto a lo que sucede con el ajuste de brillo.."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cian"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Tonos de gris"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Saturación:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -928,184 +971,184 @@ msgstr ""
 "Usar saturación cero para producir salida de tonos de grises usando tintas "
 "color y negro."
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Tipo de Tinta"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Tipo de salida:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Cancelar"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Negro"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Amarillo"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Saturación:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1196,133 +1239,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Estándar"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Alimentación por Rollo"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autoseleccionar"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Altura:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografía"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Negro"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarillo"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Opaco"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Película Brillante"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Negro"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1392,11 +1441,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1545,106 +1594,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Cian Claro"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de salida:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamaño"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 PPP Unidireccional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "La impresora no soporta salida de color\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1698,144 +1748,155 @@ msgid "test print"
 msgstr "prueba de impresión"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Cuatro Colores Estándard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Tres Colores Compuestos"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Fotografía de Seis Colores"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Fotografía Compuesta de Cinco Colores"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Película Brillante"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Sobres"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Papel para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Calidad Fotográfica para Chorro de Tinta"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Papel para Fotografía"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografía Premium Luster"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel Brillante de Calidad Fotográfica"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Película Brillante"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Opaco"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar el balance de cian de la impresión"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajusta el balance magenta de la impresión"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajusta el balance amarillo de la impresión"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Blanco y Negro"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar el balance de cian de la impresión"
@@ -1917,14 +1978,6 @@ msgstr "600x600 PPP monocromo"
 msgid "2400x600 DPI"
 msgstr "2400x600 PPP"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Negro + Color"
@@ -1933,27 +1986,17 @@ msgstr "Cartuchos Negro + Color"
 msgid "Color + Photo Cartridges"
 msgstr "Cartuchos Color + Fotografía"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "Archivo PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "¿Archivo PPD?"
@@ -1962,166 +2005,184 @@ msgstr "¿Archivo PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Tonos de gris"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Tonos de gris"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Fotografía de Seis Colores"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Tres Colores Compuestos"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Cuatro Colores Estándard"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Colores Compuestos Mejorados"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Siete Colores Mejorados"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Fotografía de Seis Colores"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografía de Seis Colores"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Papel Común Carga Rápida"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postal"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 #, fuzzy
 msgid "Back Light Film"
 msgstr "Back Light Film"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel Brillante de Altísima Calidad Fotográfica"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel Común"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Opaco"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2189,68 +2250,78 @@ msgstr "1440 x 720 PPP"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 PPP"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 PPP Altísima Calidad "
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 PPP"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 PPP"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 PPP"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nombre de la Impresora:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brillo:"
@@ -2971,1335 +3042,1488 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Pulgada"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Seleccionar la unidad base de medida a pulgadas a centímetros"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Seleccionar la unidad base de medida a pulgadas"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Salida de color"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimir en sombras de gris usando tinta negra"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Estándar"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Comando:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Archivo"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "Aceptar"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Acerca de"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 #, fuzzy
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 #, fuzzy
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Guardar Conf."
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 #, fuzzy
 msgid ""
 "Position the image on the page.\n"
@@ -4325,76 +4549,76 @@ msgstr ""
 "Si presiona otro botón mientras arrastra el ratón, la imagen volverá a\n"
 "posición original\n"
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Dimensiones:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Ancho:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Ancho del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Altura:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura del papel al que desea imprimir"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Posición"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Automático"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Apaisado"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Invertido"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Horizontal invertido"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4402,126 +4626,126 @@ msgstr ""
 "Seleccionar la orientación: vertical, horizontal, invertido,  ú horizontal "
 "invertido "
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientación:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Izquierda:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Distancia desde el borde izquierdo del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Derecha:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 "Distancia desde el borde izquierdo del papel al borde derecho de la imagen"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Distancia desde el borde derecho del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Arriba:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Distancia desde el borde superior del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Abajo:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 "Distancia desde el borde superior del papel al borde inferior de la imagen"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distancia desde el borde inferior del papel al borde de la imagen"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centrado: "
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar la imagen horizontalmente en el papel"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centrar la imagen en el papel"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertical"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centrar la imagen verticalmente en el papel"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Modelo de Impresora:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Seleccionar su madelo de impresora"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "Archivo PPD:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Explorar"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Elija el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4530,54 +4754,54 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Ingrese el nombre de archivo PPD correcto para su impresora"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "prueba de impresión"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "¿Imprimir a un archivo?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Definir Nueva Impresora"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Nombre de la Impresora:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Ingrese el nombre que desea dar a ésta impresora lógica"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca de Gimp-Print..."
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Versión de Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4622,11 +4846,11 @@ msgstr ""
 "junto con éste programa; si no, escriba a la Fundación de Software\n"
 "Libre, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307 USA\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Configuración de la Impresora"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4634,11 +4858,11 @@ msgstr ""
 "Seleccionar el nombre de la impresora (no el tipo, o modelo de impresora) al "
 "que desea imprimir"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Conf. Impresora..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4646,11 +4870,11 @@ msgstr ""
 "Elegir el modelo de impresora, archivo PPD, y comando que se usa para "
 "imprimir a ésta impresora"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Impresora Nueva..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4658,24 +4882,24 @@ msgstr ""
 "Definir una nueva impresora lógica. Ésta puede ser usada para nombrar una "
 "colección de configuraciones que usted desea recordar para uso futuro."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamaño"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Escala:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Establecer la escala (el tamaño) de la imagen"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr "Escalar por:"
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4683,31 +4907,31 @@ msgstr ""
 "Seleccionar si la escala se mide como porcentaje de la medida del papel "
 "disponible o número de puntos por pulgada en la salida."
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Porcentaje"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Redimensionar la impresión al tamaño de la página"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPP"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Redimensionar la impresión al tamaño de los puntos por pulgada"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Establecer el ancho de la impresión"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Establecer el alto de la impresión"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4715,69 +4939,69 @@ msgstr ""
 "Usar Medida Orig.\n"
 "de la Imagen"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Establecer la medida de impresión a la medida de la imagen"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Ajuste de Impresión en Color"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Establecer por Omisión"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Vista previa de imagen"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Tipo de salida:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Seleccionar el tipo de salida deseado"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Ajustar Salida..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Ajustar balance de color, brillo, contraste, saturacion, y algoritmo de "
 "entramado"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccionar la unidad base de medida para imprimir"
 
@@ -4810,12 +5034,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimir"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Configuración de la Impresora"
@@ -4865,68 +5089,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Configuración de la Impresora"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de salida:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bandeja 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bandeja 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bandeja 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bandeja 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "prueba de impresión"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Spanish"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5208,18 +5432,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "No puedo leer %s de: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "No puedo abrir %s  para lectura/escritura: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5228,7 +5452,7 @@ msgstr ""
 "\n"
 "No puedo escribir a %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5246,86 +5470,87 @@ msgstr ""
 "No puedo detectar el tipo de impresora.\n"
 "Favor de usar -m para especificar su modelo de impresora.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 "La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "No puedo analizar salida de la impresora\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "La impresora no soporta salida de color\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Color de tinta"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Porcentaje restante"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "La obtención de los niveles de tinta requiere usar un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "La identificación de la impresora requiere el uso de un dispositivo crudo.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Usted sólo puede especificar un modelo de impresora"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpiando inyectores...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Ejecutando la prueba de los inyectores de tinta, favor de asegurarse que "
 "haya papel en la impresora.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5404,7 +5629,7 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5476,12 +5701,12 @@ msgstr ""
 "durante éste proceso.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "No puedo enviar comando a la impresora, saliendo.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5500,13 +5725,13 @@ msgstr ""
 "Luego le será requerido confirmar su elección.\n"
 "¿Qué opción elige? (s), (q), (r).\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5514,7 +5739,7 @@ msgstr ""
 "Favor de confirmar tipeando 'q' de nuevo que usted quiere salir sin "
 "guardar:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5523,7 +5748,7 @@ msgstr ""
 "Bien, su impresora está alineada, pero la alineación no fue guardada.\n"
 "Si quiere guardar la alineación, deberá repetir éste proceso.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5532,12 +5757,12 @@ msgstr ""
 "Favor de confirmar tipeando 'r' de nuevo que usted quiere repetir el\n"
 "proceso de alineado:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repitiendo el proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5552,17 +5777,17 @@ msgstr ""
 "Favor de confirmar que desea guardar la configuración de su impresora\n"
 "tipeando 's' de nuevo.\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Acerca de guardar configuración..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "¡falló!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5571,27 +5796,27 @@ msgstr ""
 "Su configuración no fue guardada exitosamente. Debe repetir el\n"
 "proceso de alineación.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "¡éxito!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Su configuración de alineación fue guardada a la impresora.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando no reconocido.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "El comando final no fue confirmado.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5608,12 +5833,12 @@ msgstr ""
 "Favor de poner una hoja de papel en la impresora para comenzar el\n"
 "procedimiento de alineación del cabezal.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Presione enter para continuar > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5624,42 +5849,42 @@ msgstr ""
 "patrón.\n"
 "Tipee un número par, '?' para ayuda, ó 'r' para repetir el procedimiento.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Pasar #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Favor de insertar una hoja de papel sin imprimir.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "¡Número fuera de rango!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "¡No puedo entender lo que usted ha tipeado!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "El mejor par de líneas  debe ser numerado entre 1 y %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Intentando definir alineación..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "éxito.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5672,7 +5897,7 @@ msgstr ""
 "para cada línea es patrón %d. Si no lo es, debe repetir el proceso para\n"
 "obtener la mejor calidad de impresión.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Error en entrada\n"
diff --git a/po/fr.gmo b/po/fr.gmo
index 478b189..53fdd36 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index fdd68dc..6735cdf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 4.2.1-pre4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-09-15 16:07+0200\n"
 "Last-Translator: Raymond Ostertag <r.ostertag@caramail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -78,16 +78,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densité :"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -148,313 +148,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorithme de tramage"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 ppp"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 ppp"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150 x 150 ppp"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150 x 150 ppp"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300 x 300 ppp"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600 x 600 ppp"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 ppp"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 ppp MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 ppp"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 ppp"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 ppp"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 ppp"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150 x 150 ppp"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150 x 150 ppp"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300 x 300 ppp"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300 x 300 ppp"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600 x 300 ppp"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600 x 300 ppp"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600 x 600 ppp"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600 x 600 ppp"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200 x 600 ppp"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200 x 600 ppp"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200 x 600 ppp"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200 x 600 ppp"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400 x 600 ppp"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400 x 600 ppp"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Papier normal"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Papier normal"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Transparents"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Film back print"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Feuilles de fabrique"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Enveloppe"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Papier haute résolution"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "Transferts T-Shirt"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Film glacé"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Papier glacé qualité photo"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Cartes glacées qualité photo"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Papier photo pro"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Autre"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Taille"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Paramètres de l'imprimante"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Taille du papier sur lequel vous souhaitez imprimer"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Type de support"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Source du support"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Source (bac) du support vers lequel vous imprimez"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Résolution"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Résolution et qualité de l'impression"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Type d'encre"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type d'encre dans l'imprimante"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,78 +464,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modèle d'imprimante :"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papier normal"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densité :"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densité :"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densité :"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -543,18 +551,18 @@ msgstr "Ajuste le niveau de cyan de l'impression"
 msgid "Light Cyan Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -562,56 +570,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Magenta clair"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Insertion automatique"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manuel avec pause"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manuel sans pause"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Papier Mat"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Noir"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "Couleur CMJ"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "Couleur CMJN"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Photo couleur CcMmJ"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Photo couleur CcMmJN"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Couleur"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -652,9 +680,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimer"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
@@ -679,114 +707,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Annuler"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma :"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma :"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Type d'image"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Type d'image"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma :"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Luminosité :"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Défini la hauteur de l'impression"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Contraste :"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -797,129 +834,135 @@ msgstr ""
 "généralement produire une impression plus sombre. Noir et Blanc vont rester "
 "identiques en fonction de l'ajustement du brillant."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma :"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Jaune"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Niveaux de gris"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Saturation :"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -928,184 +971,184 @@ msgstr ""
 "Utilisez la saturation zéro pour produire une sortie en tons de gris avec "
 "les encres noir et couleurs."
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Type d'encre"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Type de sortie :"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Annuler"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Noir"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Jaune"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Saturation :"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1196,133 +1239,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Alimentation rouleau"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuel"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Sélection auto"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Hauteur :"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Photographie"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six couleurs photo"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta clair"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Noir"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Jaune"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papier Mat"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papier photo"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Film glacé"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Noir"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1392,11 +1441,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1545,106 +1594,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Cyan clair"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Type de sortie :"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Taille"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 ppp Unirectionnel"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 ppp Unirectionnel"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "L'imprimante ne supporte pas les sorties en couleur\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1698,144 +1748,155 @@ msgid "test print"
 msgstr "test d'impression"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Quatre couleurs standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Trois couleurs composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Six couleurs photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Cinq couleurs photo composite"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Film glacé"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Enveloppes"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Papier jet d'encre"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier jet d'encre qualité photo"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Papier photo"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Papier photo Premium Luster"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Papier glacé qualité photo"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Papier épais Ilford"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Film glacé"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Papier Mat"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajuste le niveau de cyan de l'impression"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajuste le niveau de majenta de l'impression"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajuste le niveau de jaune de l'impression"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Noir et blanc"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajuste le niveau de cyan de l'impression"
@@ -1916,14 +1977,6 @@ msgstr "600 x 600 ppp Monochrome"
 msgid "2400x600 DPI"
 msgstr "2400 x 600 ppp"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Cartouches couleur et noir"
@@ -1932,27 +1985,17 @@ msgstr "Cartouches couleur et noir"
 msgid "Color + Photo Cartridges"
 msgstr "Cartouches couleur et photo"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "Fichier PPD :"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "Fichier PPD ?"
@@ -1961,163 +2004,181 @@ msgstr "Fichier PPD ?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "Niveaux de gris deux niveaux"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Niveaux de gris deux niveaux"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "Quadichromie"
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Six couleurs amélioré composite"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Six couleurs photo"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatre couleurs standard"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Trois couleurs composite"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Trois couleurs composite"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatre couleurs standard"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatre couleurs standard"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six couleurs photo"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six couleurs amélioré composite"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Photo sept couleurs"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sept couleurs amélioré"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Six couleurs photo"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six couleurs photo"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Papier normal chargement rapide"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Carte postale"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr "Film back light"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papier Mat"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papier glacé photo Premium"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papier normal"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papier Mat"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2185,68 +2246,78 @@ msgstr "1440 x 720 ppp"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 ppp"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 ppp Trés haute qualité"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 ppp"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 ppp"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 ppp"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Nom de l'imprimante :"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nom de l'imprimante :"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Luminosité :"
@@ -2948,1313 +3019,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Pouce"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Défini l'unité de base de mesure en pouce"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Défini l'unité de base de mesure en centimètres"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Imprimer"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Défini l'unité de base de mesure en pouce"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Défini l'unité de base de mesure en centimètres"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Défini l'unité de base de mesure en pouce"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Sortie couleur"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimer en niveaux de gris en utilisant l'encre noire"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Commande :"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Fichier"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "Valider"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Print v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "À propos"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4262,7 +4486,7 @@ msgstr ""
 "Imprimer et enregistrer\n"
 "les réglages"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4270,15 +4494,15 @@ msgstr ""
 "Enregistrer\n"
 "les réglages"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Imprimer"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Aperçu"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4303,76 +4527,76 @@ msgstr ""
 "Si vous cliquez un autre bouton tandis que vous bougez la souris, l'image "
 "retournera à sa position originale."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Taille"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Dimensions :"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Largeur :"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Largeur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Hauteur :"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Hauteur du papier sur lequel vous souhaitez imprimer"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Taille"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Portrait"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Paysage"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Retourner"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Panoramique"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4380,125 +4604,125 @@ msgstr ""
 "Sélectionnez l'orientation : portrait, paysage, tête-bèche, ou tête-bèche "
 "paysage"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientation :"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Gauche :"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Distance entre le bord gauche du papier et l'image"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Droite :"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Distance entre le bord gauche du papier et le bord droit de l'image"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Distance entre le bord droit du papier et l'image"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Dessus :"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Distance entre le bord supérieur du papier et l'image"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Bas :"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 "Distance entre le bord supérieur du papier et le bord inférieur de l'image"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distance entre le bord inférieur du papier et l'image"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centrer :"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalement"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centrer l'image horizontalement sur le papier"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Les deux"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centrer l'image sur le papier"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticalement"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centrer l'image verticalement sur le papier"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Configuration de l'imprimante"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Sélectionnez le modèle de votre imprimante"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Modèle d'imprimante :"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Sélectionnez le modèle de votre imprimante"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "Fichier PPD :"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Entrez le nom de fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Parcourir"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Choisissez le fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4507,54 +4731,54 @@ msgstr ""
 "Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
 "voulez utiliser pour l'impression"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Entrez le nom de fichier PPD correct pour votre imprimante"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "test d'impression"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Imprimer dans un fichier ?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Définir une nouvelle imprimante"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Nom de l'imprimante :"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Saisissez le nom que vous voulez donner à cette imprimante logique"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "À propos de Gimp-Print"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Version de Gimp-Print"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4603,11 +4827,11 @@ msgstr ""
 "avec le programme; si ce n'est pas le cas, écrivez à la Free Software\n"
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Paramètres de l'imprimante"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4615,11 +4839,11 @@ msgstr ""
 "Sélectionnez le nom de l'imprimante (pas le type ni le modèle) que vous "
 "voulez utiliser pour l'impression"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Configurer l'imprimante..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4627,11 +4851,11 @@ msgstr ""
 "Indiquez le modèle d'imprimante, le fichier PPD et la commande nécessaire "
 "pour l'impression sur cette imprimante"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Nouvelle imprimante..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4639,24 +4863,24 @@ msgstr ""
 "Crée une nouvelle imprimante logique. Cela peut être utilisé pour nommer un "
 "ensemble de réglage que vous souhaitez réutiliser plus tard."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Taille"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Échelle :"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Régler l'échelle (taille) de l'image"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4664,31 +4888,31 @@ msgstr ""
 "Sélectionnez si l'échelle est mesurée en pourcentage de la taille de la page "
 "ou en nombre de points par pouces"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Pourcentage"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Dimensionne l'impression par rapport à la taille de la page"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "points par pouce"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Dimensionne l'impression en nombre de points par pouce"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Défini la largeur de l'impression"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Défini la hauteur de l'impression"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4696,69 +4920,69 @@ msgstr ""
 "Utiliser la taille \n"
 "de l'image originale"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Utiliser la taille de l'image comme taille d'impression"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Ajustez les couleurs d'impression"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Valeurs par défaut"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Fermer"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Aperçu de l'image"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Type de sortie :"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Type de sortie :"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Sélectionnez le type de sortie désiré"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Ajuster la sortie..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Ajustement de la balance des couleurs, luminosité, contraste, saturation et "
 "algorithme de tramage"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unités :"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Unités :"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Sélectionne l'unité de base de mesure pour l'impression"
 
@@ -4791,12 +5015,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimer"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Configuration de l'imprimante"
@@ -4846,68 +5070,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Paramètres de l'imprimante"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Type de sortie :"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Commande :"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Bac 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Bac 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Bac 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Bac 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "test d'impression"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "French"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5194,18 +5418,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Impossible de lire à partir de %s : %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Impossible d'ouvrir %s en lecture/écriture : %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5214,7 +5438,7 @@ msgstr ""
 "\n"
 "Impossible d'écrire sur %s : %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5232,87 +5456,88 @@ msgstr ""
 "Impossible de détecter le type de l'imprimante.\n"
 "Veuillez utiliser -m pour spécifier le modèle de votre imprimante.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 "Obtenir les niveaux d'encre demande d'utiliser un périphérique d'entrée\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Impossible d'interpréter le message envoyé par l'imprimante\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "L'imprimante ne supporte pas les sorties en couleur\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Encre couleur"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Pourcentage restant"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 "Obtenir les niveaux d'encre demande d'utiliser un périphérique d'entrée\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 "L'identification de l'imprimante demande d'utiliser un périphérique "
 "d'entrée\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Vous ne pouvez spécifier qu'un modèle d'imprimante"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Nettoyage des têtes...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Vérification des buses, s'il vous plait assurez-vous qu'il y ait du papier "
 "dans l'imprimante\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5397,7 +5622,7 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5473,12 +5698,12 @@ msgstr ""
 "durant cette opération.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Impossible d'envoyer la commande à l'imprimante, abandon.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5498,13 +5723,13 @@ msgstr ""
 "Il vous sera ensuite demandé de confirmer votre choix\n"
 "Que voulez-vous faire (s, q, r) ?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
@@ -5512,7 +5737,7 @@ msgstr ""
 "Veuillez presser la touche « q » si vous souhaitez vraiment quitter sans "
 "enregistrer :\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5522,7 +5747,7 @@ msgstr ""
 "Si vous souhaitez enregistrer l'alignement, vous devez répéter cette "
 "opération.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5531,12 +5756,12 @@ msgstr ""
 "S'il vous plait confirmez en tapant à nouveau 'r' que vous voulez\n"
 "reprendre l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Répétition de l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5551,17 +5776,17 @@ msgstr ""
 "Veuillez taper « s » de nouveau pour confirmer que vous voulez\n"
 "enregistrer les réglages de votre imprimante.\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "À propos de l'enregistrement des réglages..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "Échec !\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5570,27 +5795,27 @@ msgstr ""
 "Vos réglages n'ont pas été sauvegardés avec succès. Vous devez répéter\n"
 "l'opération d'alignement.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "Succès !\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Vos réglages d'alignement ont été enregistrés dans l'imprimante.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Commande non reconnue.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "La dernière commande n'a pas été confirmée.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5607,12 +5832,12 @@ msgstr ""
 "S'il vous plait placez une feuillle de papier dans votre imprimante\n"
 "pour commencer l'opération d'ailgnement des têtes.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Pressez Entrée pour continuer > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5623,42 +5848,42 @@ msgstr ""
 "lignes dans chaque trame.\n"
 "Tapez un nombre de paire, '?' pourl'aide ou 'r' pour répéter l'opération.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Passe #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Veuillez insérer une feuille de papier vierge.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nombre hors-intervalle !\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Je ne comprends pas ce que vous avez tapé !\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "La meilleure paire de lignes doit être comprise entre 1 et %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentative de réglage de l'alignement..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "Succès.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5671,7 +5896,7 @@ msgstr ""
 "trame pour chaque ligne est la trame %d. Si ce n'est pas le cas, vous\n"
 "devriez répéter l'opération pour obtenir la meilleure qulité d'impression.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Erreur en entrée\n"
diff --git a/po/gutenprint.pot b/po/gutenprint.pot
index 49b43bd..949cb2f 100644
--- a/po/gutenprint.pot
+++ b/po/gutenprint.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -72,16 +72,16 @@ msgstr ""
 msgid "Density"
 msgstr ""
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -130,283 +130,283 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 msgid "150x150 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 msgid "300x300 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 msgid "600x300 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 msgid "600x600 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 msgid "1200x600 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI"
 msgstr ""
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI DMT"
 msgstr ""
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 msgid "Plain Paper PIXMA"
 msgstr ""
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr ""
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr ""
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr ""
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr ""
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr ""
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr ""
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr ""
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 msgid "Basic Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr ""
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -416,141 +416,168 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 msgid "Cyan Density"
 msgstr ""
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 msgid "Magenta Density"
 msgstr ""
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 msgid "Yellow Density"
 msgstr ""
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 msgid "Black Density"
 msgstr ""
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr ""
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+msgid "Cassette"
+msgstr ""
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr ""
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr ""
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr ""
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr ""
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -588,9 +615,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr ""
 
@@ -614,379 +641,393 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 msgid "Channel "
 msgstr ""
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 msgid " Gamma"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 msgid "Gamma"
 msgstr ""
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 msgid "Input Image Type"
 msgstr ""
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 msgid "Input image type"
 msgstr ""
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 msgid "Output Image Type"
 msgstr ""
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 msgid "Output image type"
 msgstr ""
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+msgid "SimpleGamma"
+msgstr ""
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 msgid "Brightness"
 msgstr ""
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 msgid "Brightness of the print"
 msgstr ""
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 msgid "Contrast"
 msgstr ""
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Advanced Image Control"
 msgstr ""
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 msgid "AppGamma"
 msgstr ""
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr ""
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr ""
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr ""
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
 msgstr ""
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 msgid "GrayBalance"
 msgstr ""
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 msgid "Magenta Balance"
 msgstr ""
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 msgid "Yellow Balance"
 msgstr ""
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
 msgstr ""
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 msgid "Saturation"
 msgstr ""
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 msgid "Ink Limit"
 msgstr ""
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 msgid " Curve"
 msgstr ""
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 msgid "Output Curves"
 msgstr ""
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 msgid "Cyan curve"
 msgstr ""
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 msgid "Magenta Curve"
 msgstr ""
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 msgid "Magenta curve"
 msgstr ""
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 msgid "Yellow Curve"
 msgstr ""
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 msgid "Yellow curve"
 msgstr ""
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 msgid "Black Curve"
 msgstr ""
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 msgid "Black curve"
 msgstr ""
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 msgid "Red Curve"
 msgstr ""
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 msgid "Red curve"
 msgstr ""
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 msgid "Green Curve"
 msgstr ""
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 msgid "Green curve"
 msgstr ""
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 msgid "Blue Curve"
 msgstr ""
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 msgid "Blue curve"
 msgstr ""
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 msgid "White Curve"
 msgstr ""
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 msgid "White curve"
 msgstr ""
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 msgid "Saturation Map"
 msgstr ""
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1074,119 +1115,124 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 msgid "Manual Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 msgid "Print to CD"
 msgstr ""
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 msgid "High"
 msgstr ""
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 msgid "Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 msgid "Light Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 msgid "Matte Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 msgid "Gloss Optimizer"
 msgstr ""
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+msgid "Light Light Black"
+msgstr ""
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1253,11 +1299,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1387,96 +1433,97 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+msgid "Light Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:516
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
-msgid "Light Gray Transition"
-msgstr ""
-
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 msgid "Automatic"
 msgstr ""
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1530,138 +1577,149 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr ""
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -1741,14 +1799,6 @@ msgstr ""
 msgid "2400x600 DPI"
 msgstr ""
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -1757,26 +1807,16 @@ msgstr ""
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 msgid "PPDFile"
 msgstr ""
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 msgid "PPD File"
 msgstr ""
 
@@ -1784,146 +1824,161 @@ msgstr ""
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+msgid "Three Level Grayscale"
+msgstr ""
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+msgid "Eight Color Photo"
+msgstr ""
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+msgid "Eight Color Raw"
+msgstr ""
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -1980,60 +2035,68 @@ msgstr ""
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+msgid "1440 x 720 DPI Transposed"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 msgid "2880 x 720 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 msgid "1440 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 msgid "2880 x 1440 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+msgid "2880 x 1440 DPI Transposed"
+msgstr ""
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 msgid "2880 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 msgid "5760 x 2880 DPI"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 msgid "Eight Pass"
 msgstr ""
 
@@ -2722,1183 +2785,1307 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
-msgid "EPSON Stylus C20SX"
+msgid "Canon PIXMA iP4000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:169
-msgid "EPSON Stylus C20UX"
+msgid "EPSON Stylus C20"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:170
-msgid "EPSON Stylus C40SX"
+msgid "EPSON Stylus C20SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:171
-msgid "EPSON Stylus C40UX"
+msgid "EPSON Stylus C20UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:172
-msgid "EPSON Stylus C41SX"
+msgid "EPSON Stylus C40"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:173
-msgid "EPSON Stylus C41UX"
+msgid "EPSON Stylus C40SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:174
-msgid "EPSON Stylus C42SX"
+msgid "EPSON Stylus C40UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:175
-msgid "EPSON Stylus C42UX"
+msgid "EPSON Stylus C41"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:176
-msgid "EPSON Stylus C43SX"
+msgid "EPSON Stylus C41SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:177
-msgid "EPSON Stylus C43UX"
+msgid "EPSON Stylus C41UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:178
-msgid "EPSON Stylus C44SX"
+msgid "EPSON Stylus C42"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:179
-msgid "EPSON Stylus C44UX"
+msgid "EPSON Stylus C42SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:180
-msgid "EPSON Stylus C45"
+msgid "EPSON Stylus C42UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:181
-msgid "EPSON Stylus C46"
+msgid "EPSON Stylus C43"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:182
-msgid "EPSON Stylus C50"
+msgid "EPSON Stylus C43SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:183
-msgid "EPSON Stylus C60"
+msgid "EPSON Stylus C43UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:184
-msgid "EPSON Stylus C61"
+msgid "EPSON Stylus C44"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:185
-msgid "EPSON Stylus C62"
+msgid "EPSON Stylus C44SX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:186
-msgid "EPSON Stylus C63"
+msgid "EPSON Stylus C44UX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:187
-msgid "EPSON Stylus C64"
+msgid "EPSON Stylus C45"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:188
-msgid "EPSON Stylus C65"
+msgid "EPSON Stylus C46"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:189
-msgid "EPSON Stylus C66"
+msgid "EPSON Stylus C48"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:190
-msgid "EPSON Stylus C70"
+msgid "EPSON Stylus C50"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:191
-msgid "EPSON Stylus C80"
+msgid "EPSON Stylus C60"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:192
-msgid "EPSON Stylus C82"
+msgid "EPSON Stylus C61"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:193
-msgid "EPSON Stylus C83"
+msgid "EPSON Stylus C62"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:194
-msgid "EPSON Stylus C84"
+msgid "EPSON Stylus C63"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:195
-msgid "EPSON Stylus C85"
+msgid "EPSON Stylus C64"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:196
-msgid "EPSON Stylus C86"
+msgid "EPSON Stylus C65"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:197
-msgid "EPSON Stylus Color"
+msgid "EPSON Stylus C66"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:198
-msgid "EPSON Stylus Color Pro"
+msgid "EPSON Stylus C68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:199
-msgid "EPSON Stylus Color Pro XL"
+msgid "EPSON Stylus C70"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:200
-msgid "EPSON Stylus Color 400"
+msgid "EPSON Stylus C80"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:201
-msgid "EPSON Stylus Color 440"
+msgid "EPSON Stylus C82"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:202
-msgid "EPSON Stylus Color 460"
+msgid "EPSON Stylus C83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:203
-msgid "EPSON Stylus Color 480"
+msgid "EPSON Stylus C84"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:204
-msgid "EPSON Stylus Color 500"
+msgid "EPSON Stylus C85"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:205
-msgid "EPSON Stylus Color 580"
+msgid "EPSON Stylus C86"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:206
-msgid "EPSON Stylus Color 600"
+msgid "EPSON Stylus C88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:207
-msgid "EPSON Stylus Color 640"
+msgid "EPSON Stylus Color"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:208
-msgid "EPSON Stylus Color 660"
+msgid "EPSON Stylus Color Pro"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:209
-msgid "EPSON Stylus Color 670"
+msgid "EPSON Stylus Color Pro XL"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:210
-msgid "EPSON Stylus Color 680"
+msgid "EPSON Stylus Color 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:211
-msgid "EPSON Stylus Color 740"
+msgid "EPSON Stylus Color 440"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:212
-msgid "EPSON Stylus Color 760"
+msgid "EPSON Stylus Color 460"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:213
-msgid "EPSON Stylus Color 777"
+msgid "EPSON Stylus Color 480"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:214
-msgid "EPSON Stylus Color 800"
+msgid "EPSON Stylus Color 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:215
-msgid "EPSON Stylus Color 850"
+msgid "EPSON Stylus Color 580"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:216
-msgid "EPSON Stylus Color 860"
+msgid "EPSON Stylus Color 600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:217
-msgid "EPSON Stylus Color 880"
+msgid "EPSON Stylus Color 640"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:218
-msgid "EPSON Stylus Color 83"
+msgid "EPSON Stylus Color 660"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:219
-msgid "EPSON Stylus Color 900"
+msgid "EPSON Stylus Color 670"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:220
-msgid "EPSON Stylus Color 980"
+msgid "EPSON Stylus Color 680"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:221
-msgid "EPSON Stylus Color 1160"
+msgid "EPSON Stylus Color 740"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:222
-msgid "EPSON Stylus Color 1500"
+msgid "EPSON Stylus Color 760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:223
-msgid "EPSON Stylus Color 1520"
+msgid "EPSON Stylus Color 777"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:224
-msgid "EPSON Stylus Color 3000"
+msgid "EPSON Stylus Color 800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:225
-msgid "EPSON Stylus Photo"
+msgid "EPSON Stylus Color 850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:226
-msgid "EPSON Stylus Photo 700"
+msgid "EPSON Stylus Color 860"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:227
-msgid "EPSON Stylus Photo EX"
+msgid "EPSON Stylus Color 880"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:228
-msgid "EPSON Stylus Photo EX3"
+msgid "EPSON Stylus Color 83"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:229
-msgid "EPSON Stylus Photo 720"
+msgid "EPSON Stylus Color 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:230
-msgid "EPSON Stylus Photo 750"
+msgid "EPSON Stylus Color 980"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:231
-msgid "EPSON Stylus Photo 780"
+msgid "EPSON Stylus Color 1160"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:232
-msgid "EPSON Stylus Photo 785EPX"
+msgid "EPSON Stylus Color 1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:233
-msgid "EPSON Stylus Photo 790"
+msgid "EPSON Stylus Color 1520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:234
-msgid "EPSON Stylus Photo 810"
+msgid "EPSON Stylus Color 3000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:235
-msgid "EPSON Stylus Photo 820"
+msgid "EPSON Stylus Photo"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:236
-msgid "EPSON Stylus Photo 825"
+msgid "EPSON Stylus Photo 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:237
-msgid "EPSON Stylus Photo 830"
+msgid "EPSON Stylus Photo EX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:238
-msgid "EPSON Stylus Photo 870"
+msgid "EPSON Stylus Photo EX3"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:239
-msgid "EPSON Stylus Photo 875"
+msgid "EPSON Stylus Photo 720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:240
-msgid "EPSON Stylus Photo 890"
+msgid "EPSON Stylus Photo 750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:241
-msgid "EPSON Stylus Photo 895"
+msgid "EPSON Stylus Photo 780"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:242
-msgid "EPSON Stylus Photo 900"
+msgid "EPSON Stylus Photo 785EPX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:243
-msgid "EPSON Stylus Photo 915"
+msgid "EPSON Stylus Photo 790"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:244
-msgid "EPSON Stylus Photo 925"
+msgid "EPSON Stylus Photo 810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:245
-msgid "EPSON Stylus Photo 935"
+msgid "EPSON Stylus Photo 820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:246
-msgid "EPSON Stylus Photo 950"
+msgid "EPSON Stylus Photo 825"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:247
-msgid "EPSON Stylus Photo 960"
+msgid "EPSON Stylus Photo 830"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:248
-msgid "EPSON Stylus Photo 1200"
+msgid "EPSON Stylus Photo 870"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:249
-msgid "EPSON Stylus Photo 1270"
+msgid "EPSON Stylus Photo 875"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:250
-msgid "EPSON Stylus Photo 1280"
+msgid "EPSON Stylus Photo 890"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:251
-msgid "EPSON Stylus Photo 1290"
+msgid "EPSON Stylus Photo 895"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:252
-msgid "EPSON Stylus Photo 2000P"
+msgid "EPSON Stylus Photo 900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:253
-msgid "EPSON Stylus Photo 2100"
+msgid "EPSON Stylus Photo 915"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:254
-msgid "EPSON Stylus Photo 2200"
+msgid "EPSON Stylus Photo 925"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:255
-msgid "EPSON Stylus Photo R200"
+msgid "EPSON Stylus Photo 935"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:256
-msgid "EPSON Stylus Photo R210"
+msgid "EPSON Stylus Photo 950"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:257
-msgid "EPSON Stylus Photo R300"
+msgid "EPSON Stylus Photo 960"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:258
-msgid "EPSON Stylus Photo R310"
+msgid "EPSON Stylus Photo 1200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:259
-msgid "EPSON Stylus Photo RX400"
+msgid "EPSON Stylus Photo 1270"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:260
-msgid "EPSON Stylus Photo RX420"
+msgid "EPSON Stylus Photo 1280"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:261
-msgid "EPSON Stylus Photo RX425"
+msgid "EPSON Stylus Photo 1290"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:262
-msgid "EPSON Stylus Photo RX430"
+msgid "EPSON Stylus Photo 2000P"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:263
-msgid "EPSON Stylus Photo RX500"
+msgid "EPSON Stylus Photo 2100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:264
-msgid "EPSON Stylus Photo RX510"
+msgid "EPSON Stylus Photo 2200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:265
-msgid "EPSON Stylus Photo RX600"
+msgid "EPSON Stylus Photo R200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:266
-msgid "EPSON Stylus Photo RX620"
+msgid "EPSON Stylus Photo R210"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:267
-msgid "EPSON Stylus Photo RX630"
+msgid "EPSON Stylus Photo R220"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:268
-msgid "EPSON Stylus Photo R800"
+msgid "EPSON Stylus Photo R300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:269
-msgid "EPSON Stylus Photo R1800"
+msgid "EPSON Stylus Photo R310"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:270
-msgid "EPSON Stylus Pro 5000"
+msgid "EPSON Stylus Photo R320"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:271
-msgid "EPSON Stylus Pro 5500"
+msgid "EPSON Stylus Photo R340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:272
-msgid "EPSON Stylus Pro 7000"
+msgid "EPSON Stylus Photo RX400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:273
-msgid "EPSON Stylus Pro 7500"
+msgid "EPSON Stylus Photo RX420"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:274
-msgid "EPSON Stylus Pro 7600"
+msgid "EPSON Stylus Photo RX425"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:275
-msgid "EPSON Stylus Pro 9000"
+msgid "EPSON Stylus Photo RX430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:276
-msgid "EPSON Stylus Pro 9500"
+msgid "EPSON Stylus Photo RX500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:277
-msgid "EPSON Stylus Pro 9600"
+msgid "EPSON Stylus Photo RX510"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:278
-msgid "EPSON Stylus Pro 10000"
+msgid "EPSON Stylus Photo RX600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:279
-msgid "EPSON Stylus Scan 2000"
+msgid "EPSON Stylus Photo RX620"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:280
-msgid "EPSON Stylus Scan 2500"
+msgid "EPSON Stylus Photo RX630"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:281
-msgid "EPSON Stylus CX1500"
+msgid "EPSON Stylus Photo RX700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:282
-msgid "EPSON Stylus CX3100"
+msgid "EPSON Stylus Photo R800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:283
-msgid "EPSON Stylus CX3200"
+msgid "EPSON Stylus Photo R1800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:284
-msgid "EPSON Stylus CX3500"
+msgid "EPSON Stylus Photo R2400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:285
-msgid "EPSON Stylus CX3600"
+msgid "EPSON Stylus Pro 5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:286
-msgid "EPSON Stylus CX3650"
+msgid "EPSON Stylus Pro 5500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:287
-msgid "EPSON Stylus CX4600"
+msgid "EPSON Stylus Pro 7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:288
-msgid "EPSON Stylus CX5100"
+msgid "EPSON Stylus Pro 7500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:289
-msgid "EPSON Stylus CX5200"
+msgid "EPSON Stylus Pro 7600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:290
-msgid "EPSON Stylus CX5300"
+msgid "EPSON Stylus Pro 9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:291
-msgid "EPSON Stylus CX5400"
+msgid "EPSON Stylus Pro 9500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:292
-msgid "EPSON Stylus CX6300"
+msgid "EPSON Stylus Pro 9600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:293
-msgid "EPSON Stylus CX6400"
+msgid "EPSON Stylus Pro 10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:294
-msgid "EPSON Stylus CX6500"
+msgid "EPSON Stylus Scan 2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:295
-msgid "EPSON Stylus CX6600"
+msgid "EPSON Stylus Scan 2500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:296
-msgid "EPSON Stylus CX8300"
+msgid "EPSON Stylus CX1500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:297
-msgid "EPSON Stylus CX8400"
+msgid "EPSON Stylus CX3100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:298
-msgid "EPSON CL-700"
+msgid "EPSON Stylus CX3200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:299
-msgid "EPSON CL-750"
+msgid "EPSON Stylus CX3500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:300
-msgid "EPSON CL-760"
+msgid "EPSON Stylus CX3600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:301
-msgid "EPSON EM-900C"
+msgid "EPSON Stylus CX3650"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:302
-msgid "EPSON EM-930C"
+msgid "EPSON Stylus CX3700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:303
-msgid "EPSON MC-2000"
+msgid "EPSON Stylus CX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:304
-msgid "EPSON MC-5000"
+msgid "EPSON Stylus CX3810"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:305
-msgid "EPSON MC-7000"
+msgid "EPSON Stylus CX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:306
-msgid "EPSON MC-9000"
+msgid "EPSON Stylus CX4600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:307
-msgid "EPSON MC-10000"
+msgid "EPSON Stylus CX4700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:308
-msgid "EPSON MJ-930C"
+msgid "EPSON Stylus CX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:309
-msgid "EPSON MJ-5100C"
+msgid "EPSON Stylus CX5100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:310
-msgid "EPSON MJ-6000C"
+msgid "EPSON Stylus CX5200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:311
-msgid "EPSON MJ-8000C"
+msgid "EPSON Stylus CX5300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:312
-msgid "EPSON PM-700C"
+msgid "EPSON Stylus CX5400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:313
-msgid "EPSON PM-730C"
+msgid "EPSON Stylus CX5800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:314
-msgid "EPSON PM-740C"
+msgid "EPSON Stylus CX6300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:315
-msgid "EPSON PM-750C"
+msgid "EPSON Stylus CX6400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:316
-msgid "EPSON PM-760C"
+msgid "EPSON Stylus CX6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:317
-msgid "EPSON PM-770C"
+msgid "EPSON Stylus CX6600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:318
-msgid "EPSON PM-780C"
+msgid "EPSON Stylus CX7700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:319
-msgid "EPSON PM-790PT"
+msgid "EPSON Stylus CX7800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:320
-msgid "EPSON PM-800C"
+msgid "EPSON Stylus CX8300"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:321
-msgid "EPSON PM-850PT"
+msgid "EPSON Stylus CX8400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:322
-msgid "EPSON PM-870C"
+msgid "EPSON Stylus D68"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:323
-msgid "EPSON PM-880C"
+msgid "EPSON Stylus D88"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:324
-msgid "EPSON PM-930C"
+msgid "EPSON Stylus DX3800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:325
-msgid "EPSON PM-940C"
+msgid "EPSON Stylus DX3850"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:326
-msgid "EPSON PM-950C"
+msgid "EPSON Stylus DX4200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:327
-msgid "EPSON PM-970C"
+msgid "EPSON Stylus DX4800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:328
-msgid "EPSON PM-980C"
+msgid "EPSON CL-700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:329
-msgid "EPSON PM-2000C"
+msgid "EPSON CL-750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:330
-msgid "EPSON PM-2200C"
+msgid "EPSON CL-760"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:331
-msgid "EPSON PM-3000C"
+msgid "EPSON EM-900C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:332
-msgid "EPSON PM-3300C"
+msgid "EPSON EM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:333
-msgid "EPSON PM-3500C"
+msgid "EPSON MC-2000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:334
-msgid "EPSON PM-3700C"
+msgid "EPSON MC-5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:335
-msgid "EPSON PM-4000PX"
+msgid "EPSON MC-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:336
-msgid "EPSON PM-5000C"
+msgid "EPSON MC-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:337
-msgid "EPSON PM-7000C"
+msgid "EPSON MC-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:338
-msgid "EPSON PM-9000C"
+msgid "EPSON MJ-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:339
-msgid "EPSON PM-10000"
+msgid "EPSON MJ-5100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:340
-msgid "EPSON PM-D750"
+msgid "EPSON MJ-6000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:341
-msgid "EPSON PM-D770"
+msgid "EPSON MJ-8000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:342
-msgid "EPSON PM-D1000"
+msgid "EPSON PM-700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:343
-msgid "EPSON PM-G700"
+msgid "EPSON PM-730C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:344
-msgid "EPSON PM-G720"
+msgid "EPSON PM-740C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:345
-msgid "EPSON PM-G800"
+msgid "EPSON PM-750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:346
-msgid "EPSON PM-G820"
+msgid "EPSON PM-760C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:347
-msgid "EPSON PX-G900"
+msgid "EPSON PM-770C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:348
-msgid "EPSON PX-G920"
+msgid "EPSON PM-780C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:349
-msgid "EPSON PX-G5000"
+msgid "EPSON PM-790PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:350
-msgid "EPSON PX-V500"
+msgid "EPSON PM-800C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:351
-msgid "EPSON PX-V600"
+msgid "EPSON PM-850PT"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:352
-msgid "EPSON PX-7000"
+msgid "EPSON PM-870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:353
-msgid "EPSON PX-9000"
+msgid "EPSON PM-880C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:354
-msgid "Apple Color StyleWriter 4100"
+msgid "EPSON PM-930C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:355
-msgid "Apple Color StyleWriter 4500"
+msgid "EPSON PM-940C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:356
-msgid "Apple Color StyleWriter 6500"
+msgid "EPSON PM-950C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:357
-msgid "HP DeskJet 340"
+msgid "EPSON PM-970C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:358
-msgid "HP DeskJet 400"
+msgid "EPSON PM-980C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:359
-msgid "HP DeskJet 500"
+msgid "EPSON PM-2000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:360
-msgid "HP DesignJet 230"
+msgid "EPSON PM-2200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:361
-msgid "HP DesignJet 250C"
+msgid "EPSON PM-3000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:362
-msgid "HP DesignJet 700"
+msgid "EPSON PM-3300C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:363
-msgid "HP DesignJet 750C"
+msgid "EPSON PM-3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:364
-msgid "HP DesignJet 2500C"
+msgid "EPSON PM-3700C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:365
-msgid "HP DesignJet 3500C"
+msgid "EPSON PM-4000PX"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:366
-msgid "HP DesignJet 430"
+msgid "EPSON PM-5000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:367
-msgid "HP DesignJet 450C"
+msgid "EPSON PM-7000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:368
-msgid "HP DesignJet 455CA"
+msgid "EPSON PM-9000C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:369
-msgid "HP DesignJet 488CA"
+msgid "EPSON PM-10000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:370
-msgid "HP DeskJet 500C"
+msgid "EPSON PM-D750"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:371
-msgid "HP DeskJet 520"
+msgid "EPSON PM-D770"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:372
-msgid "HP DeskJet 540C"
+msgid "EPSON PM-D1000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:373
-msgid "HP DeskJet 550C"
+msgid "EPSON PM-G700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:374
-msgid "HP DeskJet 560C"
+msgid "EPSON PM-G720"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:375
-msgid "HP DeskJet 600/600C"
+msgid "EPSON PM-G800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:376
-msgid "HP DeskJet 600 series"
+msgid "EPSON PM-G820"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:377
-msgid "HP DeskJet 690 series"
+msgid "EPSON PX-G900"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:378
-msgid "HP DeskJet 810C"
+msgid "EPSON PX-G920"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:379
-msgid "HP DeskJet 812C"
+msgid "EPSON PX-G5000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:380
-msgid "HP DeskJet 840C"
+msgid "EPSON PX-V500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:381
-msgid "HP DeskJet 842C"
+msgid "EPSON PX-V600"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:382
-msgid "HP DeskJet 845C"
+msgid "EPSON PX-7000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:383
-msgid "HP DeskJet 850C"
+msgid "EPSON PX-9000"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:384
-msgid "HP DeskJet 855C"
+msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:385
-msgid "HP DeskJet 870C"
+msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:386
-msgid "HP DeskJet 890C"
+msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:387
-msgid "HP DeskJet 895C"
+msgid "HP DeskJet 340"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:388
-msgid "HP DeskJet 900 series"
+msgid "HP DeskJet 400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:389
-msgid "HP DeskJet 1100C"
+msgid "HP DeskJet 500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:390
-msgid "HP DeskJet 1120C"
+msgid "HP DesignJet 230"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:391
-msgid "HP DeskJet 1200C"
+msgid "HP DesignJet 250C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:392
-msgid "HP DeskJet 1220C"
+msgid "HP DesignJet 700"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:393
-msgid "HP DeskJet 1600C"
+msgid "HP DesignJet 750C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:394
-msgid "HP DeskJet 2000 series"
+msgid "HP DesignJet 2500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:395
-msgid "HP DeskJet 2500 series"
+msgid "HP DesignJet 3500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:396
-msgid "HP PhotoSmart P1000"
+msgid "HP DesignJet 430"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:397
-msgid "HP PhotoSmart P1100"
+msgid "HP DesignJet 450C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:398
-msgid "HP LaserJet II series"
+msgid "HP DesignJet 455CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:399
-msgid "HP LaserJet IIP series"
+msgid "HP DesignJet 488CA"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:400
-msgid "HP LaserJet III series"
+msgid "HP DeskJet 500C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:401
-msgid "HP LaserJet 4 series"
+msgid "HP DeskJet 520"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:402
-msgid "HP LaserJet 4L"
+msgid "HP DeskJet 540C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:403
-msgid "HP LaserJet 4V"
+msgid "HP DeskJet 550C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:404
-msgid "HP LaserJet 4Si"
+msgid "HP DeskJet 560C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:405
-msgid "HP LaserJet 5 series"
+msgid "HP DeskJet 600/600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:406
-msgid "HP LaserJet 5Si"
+msgid "HP DeskJet 600 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:407
-msgid "HP LaserJet 6 series"
+msgid "HP DeskJet 690 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:408
-msgid "Lexmark 4076"
+msgid "HP DeskJet 810C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:409
-msgid "Lexmark Z42"
+msgid "HP DeskJet 812C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:410
-msgid "Lexmark Z43"
+msgid "HP DeskJet 840C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:411
-msgid "Lexmark Z52"
+msgid "HP DeskJet 842C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:412
-msgid "Lexmark Z53"
+msgid "HP DeskJet 845C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:413
-msgid "Olympus P10"
+msgid "HP DeskJet 850C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:414
-msgid "Olympus P200"
+msgid "HP DeskJet 855C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:415
-msgid "Olympus P300"
+msgid "HP DeskJet 870C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:416
-msgid "Olympus P400"
+msgid "HP DeskJet 890C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:417
-msgid "Olympus P440"
+msgid "HP DeskJet 895C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:418
-msgid "Canon CP100"
+msgid "HP DeskJet 900 series"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:419
-msgid "Canon CP220"
+msgid "HP DeskJet 1100C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:420
-msgid "Sony UP-DP10"
+msgid "HP DeskJet 1120C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:421
-msgid "Fujifilm Printpix CX-400"
+msgid "HP DeskJet 1200C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:422
-msgid "Fujifilm Printpix CX-550"
+msgid "HP DeskJet 1220C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:423
-msgid "RAW DATA 16 bit"
+msgid "HP DeskJet 1600C"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:424
+msgid "HP DeskJet 2000 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:425
+msgid "HP DeskJet 2500 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:426
+msgid "HP PhotoSmart P1000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:427
+msgid "HP PhotoSmart P1100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:428
+msgid "HP LaserJet II series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:429
+msgid "HP LaserJet IIP series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:430
+msgid "HP LaserJet III series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:431
+msgid "HP LaserJet 4 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:432
+msgid "HP LaserJet 4L"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:433
+msgid "HP LaserJet 4V"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:434
+msgid "HP LaserJet 4Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:435
+msgid "HP LaserJet 5 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:436
+msgid "HP LaserJet 5Si"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:437
+msgid "HP LaserJet 6 series"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:438
+msgid "Lexmark 4076"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:439
+msgid "Lexmark Z42"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:440
+msgid "Lexmark Z43"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:441
+msgid "Lexmark Z52"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:442
+msgid "Lexmark Z53"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:443
+msgid "Olympus P10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:444
+msgid "Olympus P200"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:445
+msgid "Olympus P300"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:446
+msgid "Olympus P400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:447
+msgid "Olympus P440"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:448
+msgid "Canon CP100"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:449
+msgid "Canon CP220"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:450
+msgid "Sony UP-DP10"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
+msgid "Fujifilm Printpix CX-400"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:453
+msgid "Fujifilm Printpix CX-550"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:454
+msgid "RAW DATA 16 bit"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Points"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Standard Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Custom Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 msgid "Print to a file"
 msgstr ""
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr ""
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -3912,238 +4099,238 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 msgid "Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 msgid "Image Position"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 msgid "Horizontal"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 msgid "Vertical"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 msgid "Printer Queue:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 msgid "Print To File"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 msgid "About Gutenprint "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid "Gutenprint Version "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid ""
 "\n"
 "\n"
@@ -4167,146 +4354,146 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 msgid "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 msgid "Size Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -4339,11 +4526,11 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 msgid "Printer"
 msgstr ""
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 msgid "(Default Printer)"
 msgstr ""
 
@@ -4391,60 +4578,60 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 msgid "Printer Features"
 msgstr ""
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 msgid "Gutenprint"
 msgstr ""
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -4618,25 +4805,25 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
 "Cannot write to %s: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -4651,81 +4838,82 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, c-format
 msgid "Cannot identify printer!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4764,7 +4952,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4800,12 +4988,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4817,38 +5005,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4858,44 +5046,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -4906,12 +5094,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4919,42 +5107,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -4963,7 +5151,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr ""
diff --git a/po/ja.gmo b/po/ja.gmo
index 5fb319e..f9fffd7 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index e63537e..959215c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print Version 4.2.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-10-07 19:10+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -76,16 +76,16 @@ msgstr ""
 msgid "Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -146,313 +146,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "¥Ç¥£¥¶Êý¼°"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Ä̾ï¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "¥¹¥é¥¤¥ÉÍÑ»æ"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "ÇØ·Ê°õºþÍÑ¥Õ¥£¥ë¥à"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Á¡°Ý¼Á¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "ÉõÅû"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "¹â²òÁüÅÙ¤ÎÍÑ»æ"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T-¥·¥ã¥Ä¤ÎÌÏÍÍ"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "¹â±ð¥Õ¥£¥ë¥à"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥©¥È¡¦¥«¡¼¥É"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "¥Õ¥©¥ÈÍÑ»æ Pro"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "¤½¤Î¾"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¥µ¥¤¥º¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "ÍÑ»æ¤Î¼ïÎà"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "µë»æÊýË¡"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "°õºþ»þ¤Îµë»æÊý¼°¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "²òÁüÅÙ"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "°õºþ»þ¤Î²òÁüÅÙ¤ÈÉʼÁ¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "°õºþ»þ¤Î¥¤¥ó¥¯¤Î¼ïÎà¤Ç¤¹¡£"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -462,78 +462,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "ColorLife Paper"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Ç»ÅÙ:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -541,18 +549,18 @@ msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 msgid "Light Cyan Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -560,56 +568,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "¼«Æ°µë»æ"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "¥Ý¡¼¥ºÉÕ¤­¼êÆ°µë»æ"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "¥Ý¡¼¥º¤Ê¤·¼êÆ°µë»æ"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "¹õ¿§"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY ¿§"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK ¿§"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "¥Õ¥©¥È CcMmY ¿§"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "¥Õ¥©¥È CcMmYK ¿§"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "¥«¥é¡¼"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -650,9 +678,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "°õºþ"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
@@ -677,114 +705,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "¥¬¥ó¥Þ:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "¥¬¥ó¥Þ:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "²èÁü¤Î¼ïÎà"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "²èÁü¤Î¼ïÎà"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "¥¬¥ó¥Þ:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "ÌÀ¤ë¤µ:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "¥³¥ó¥È¥é¥¹¥È:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -794,129 +831,135 @@ msgstr ""
 "ÃͤòÂ礭¤¯¤¹¤ë¤È°ìÈÌŪ¤ËÌÀ¤ë¤¤°õºþ¤Ë¤Ê¤ê¡¢¾®¤µ¤¯¤¹¤ë¤È°Å¤¤°õºþ¤Ë¤Ê¤ê¤Þ¤¹¡£\n"
 "ÌÀ¤ë¤µ¤ÎÄ´À°¤È¤Ï°Û¤Ê¤ê¡¢¹õ¿§¤ÈÇò¿§¤ÏƱ¤¸¤Þ¤Þ¤Ç¤¹¡£"
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "¥¬¥ó¥Þ:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "¥·¥¢¥ó (C)"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "¥°¥ì¡¼¥¹¥±¡¼¥ë"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "ºÌÅÙ:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -924,184 +967,184 @@ msgstr ""
 "°õºþ»þ¤ÎºÌÅÙ (¥«¥é¡¼¡¦¥Ð¥é¥ó¥¹) ¤òÄ´À°¤·¤Þ¤¹¡£\n"
 "¥«¥é¡¼¤È¹õ¤ÎξÊý¤Î¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¥¹¥±¡¼¥ë½ÐÎϤ¹¤ë¾ì¹ç¤Ï 0 ¤Ë¤·¤Æ²¼¤µ¤¤¡£"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "¥¤¥ó¥¯¤Î¼ïÎà"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "¥Þ¥¼¥ó¥¿ (M)"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "¹õ¿§"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "ºÌÅÙ:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1192,133 +1235,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "ɸ½à"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "¥í¡¼¥ë¼°µë»æ"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "¼êÆ°"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "¼«Æ°ÁªÂò"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "¹â¤µ:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "¼Ì¿¿"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Six Color Photo"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "ÌÀ¤ë¤¤¥Þ¥¼¥ó¥¿"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "¹õ¿§"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "²«¿§ (Y)"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "¹õ¿§"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1388,11 +1437,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1541,106 +1590,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "ÌÀ¤ë¤¤¥·¥¢¥ó"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidirectional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1694,144 +1744,155 @@ msgid "test print"
 msgstr "¥Æ¥¹¥È°õºþ"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Four Color Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Three Color Composite"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Six Color Photo"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Five Color Photo Composite"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "ÉõÅû"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "¥¤¥ó¥¯¥¸¥§¥Ã¥ÈÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "¹âµé¤Ä¤ä½Ð¤·¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "¸÷ÂôÉÕ¤­ÍÑ»æ (¥Õ¥©¥ÈÍѹâÉʼÁ)"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "¸÷ÂôÉÕ¤­¥Õ¥¤¥ë¥à"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "°õºþ»þ¤Î¥Þ¥¼¥ó¥¿¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "°õºþ»þ¤Î²«¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "¹õ¤ÈÇò"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "°õºþ»þ¤Î¥·¥¢¥ó¿§¤Î¥Ð¥é¥ó¥¹¤òÄ´À°¤·¤Þ¤¹¡£"
@@ -1912,14 +1973,6 @@ msgstr "600x600 DPI ¥â¥Î¥¯¥í"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸"
@@ -1928,27 +1981,17 @@ msgstr "¥«¥é¡¼ + ¹õ¥«¡¼¥È¥ê¥Ã¥¸"
 msgid "Color + Photo Cartridges"
 msgstr "¥«¥é¡¼ + ¥Õ¥©¥È¡¦¥«¡¼¥È¥ê¥Ã¥¸"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD ¥Õ¥¡¥¤¥ë:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
@@ -1957,163 +2000,181 @@ msgstr "PPD ¥Õ¥¡¥¤¥ë¤Ç¤¹¤«¡©"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "Two Level Grayscale"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Two Level Grayscale"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "Quadtone"
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Six Color Photo"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Three Color Composite"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Three Color Composite"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Four Color Standard"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Six Color Enhanced Composite"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Seven Color Photo"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Seven Color Enhanced"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Six Color Photo"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Six Color Photo"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Ä̾ïÍÑ»æ¤Î¹â®Æɹþ¤ß"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "¤Ï¤¬¤­"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr "¥Ð¥Ã¥¯¥é¥¤¥È¡¦¥Õ¥£¥ë¥à"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "¹âµé¸÷ÂôÉÕ¤­¥Õ¥©¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "ColorLife Paper"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "¥Þ¥Ã¥ÈÍÑ»æ"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2181,68 +2242,78 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1200 DPI ¹âÉʼÁ"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "ÌÀ¤ë¤µ:"
@@ -2944,1313 +3015,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C41ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "¥¤¥ó¥Á"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "¥»¥ó¥Á¥á¡¼¥È¥ë"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "°õºþ"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "´ðËÜñ°Ì¤ò¥»¥ó¥Á¥á¡¼¥È¥ë¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "´ðËÜñ°Ì¤ò¥¤¥ó¥Á¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "¥«¥é¡¼¤Ç°õºþ¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "¹õ¥¤¥ó¥¯¤ò»È¤Ã¤Æ¥°¥ì¡¼¤Î±Æ¤òÉÕ¤±¤Æ°õºþ¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "ɸ½à"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "¥³¥Þ¥ó¥É:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "¥Õ¥¡¥¤¥ë"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "½é´üÃͤËÌ᤹"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "¼è¤ê¾Ã¤·"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- °õºþ v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "¾ðÊó"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4258,7 +4482,7 @@ msgstr ""
 "°õºþ¤È\n"
 "ÀßÄê¤ÎÊݸ"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4266,15 +4490,15 @@ msgstr ""
 "ÀßÄê¤Î\n"
 "Êݸ"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "°õºþ"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "¥×¥ì¥Ó¥å¡¼"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4297,254 +4521,254 @@ msgstr ""
 "¤ò°ÜÆ°¤¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£\n"
 "¥É¥é¥Ã¥°Ãæ¤ËÊ̤Υܥ¿¥ó¤ò¥¯¥ê¥Ã¥¯¤¹¤ë¤È¡¢²èÁü¤Ï¸µ¤Î¾ì½ê¤ËÌá¤ê¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "À£Ë¡:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Éý:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤ÎÉý¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "¹â¤µ:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "°õºþ¤¹¤ëÍÑ»æ¤Î¹â¤µ¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "°ÌÃÖ"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "¼«Æ°"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "½ÄÃÖ¤­"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "²£ÃÖ¤­"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "¾å²¼"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "²£Ä¹"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 "ÍÑ»æ¤ÎÊý¸þ¤òÁªÂò¤·¤Þ¤¹: ½ÄÃÖ¤­¡¢²£ÃÖ¤­¡¢¾å²¼¡¢¤Þ¤¿¤Ï²£Ä¹ (¾å²¼¤Ä¤­¤Î²£ÃÖ¤­)"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "ÍÑ»æ¤Î¸þ¤­:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "º¸Â¦:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "±¦Â¦:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "ÍÑ»æ¤Îº¸Ã¼¤«¤é²èÁü¤Î±¦Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "ÍÑ»æ¤Î±¦Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "¾å¦:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "²¼Â¦:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "ÍÑ»æ¤Î¾åü¤«¤é²èÁü¤Î²¼Ã¼¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "ÍÑ»æ¤Î²¼Ã¼¤«¤é²èÁü¤Þ¤Ç¤Îµ÷Î¥¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Ãæ¿´:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "¿åÊ¿"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "ÍÑ»æ¤Î¿åÊ¿Êý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "ξü"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "ÍÑ»æ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "¿âľ"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "ÍÑ»æ¤Î¿âľÊý¸þ¤ÎÃæ¿´¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD ¥Õ¥¡¥¤¥ë:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "»²¾È"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ÍѤΠPPD ¥Õ¥¡¥¤¥ë̾¤òÆþÎϤ·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "¥Æ¥¹¥È°õºþ"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "¥Õ¥¡¥¤¥ë¤Ë°õºþ¤·¤Þ¤¹¤«¡©"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿¤ÎÄêµÁ"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "¥×¥ê¥ó¥¿Ì¾:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "ÍøÍѤ¹¤ëÏÀÍý¥×¥ê¥ó¥¿Ì¾¤ò»ØÄꤷ¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Gimp-Print"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print ¥Ð¡¼¥¸¥ç¥ó "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4588,31 +4812,31 @@ msgstr ""
 "Free Software Foundation, Inc., 56 Temple Place - \n"
 "Suite 330, Boston, MA 02111-1307, USA ¤Þ¤ÇÏ¢Íí¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿ (¥×¥ê¥ó¥¿¤Î·¿¼°¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ̾¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤È PPD ¥Õ¥¡¥¤¥ë¡¢°õºþ¥³¥Þ¥ó¥É¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "¿·¤·¤¤¥×¥ê¥ó¥¿..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4620,24 +4844,24 @@ msgstr ""
 "¿·µ¬¤ËÏÀÍý¥×¥ê¥ó¥¿¤òÄêµÁ¤·¤Þ¤¹¡£¤³¤ì¤Ï¼¡²ó»ÈÍѤ¹¤ë¤¿¤á¤Ë³Ð¤¨¤Æ¤ª¤­¤¿¤¤ÀßÄê̾"
 "¤Ë»ÈÍѤµ¤ì¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "²èÁü¤Î¥µ¥¤¥º"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "³ÈÂç½Ì¾®:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "²èÁü¥µ¥¤¥º¤Î³ÈÂç½Ì¾®¤ò¹Ô¤¤¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4645,31 +4869,31 @@ msgstr ""
 "³ÈÂç½Ì¾®¤Îñ°Ì¤È¤·¤Æ¡¢Íѻ極¥¤¥º¤ËÂФ¹¤ëɴʬΨ (ÈæΨ) ¤«¡¢¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤òÁª"
 "Âò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "ÈæΨ"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Íѻ極¥¤¥º¤ò 100 ¤È¤·¤¿¾ì¹ç¤ÎÈæΨ¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "²èÁü¤Î¥É¥Ã¥È¿ô/¥¤¥ó¥Á¤Ç¤¹¡£"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "°õºþ»þ¤ÎÉý¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "°õºþ»þ¤Î¹â¤µ¤ò¥»¥Ã¥È¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4677,68 +4901,68 @@ msgstr ""
 "¥ª¥ê¥¸¥Ê¥ë¤Î\n"
 "¥µ¥¤¥º¤ÎÍøÍÑ"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "²èÁü¤Î¥ª¥ê¥¸¥Ê¥ë¡¦¥µ¥¤¥º¤ò°õºþ¥µ¥¤¥º¤Ë¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "°õºþ¥«¥é¡¼Ä´À°"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "½é´üÃͤËÌ᤹"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "ÊĤ¸¤ë"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "²èÁü¤Î¥×¥ì¥Ó¥å¡¼"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "½ÐÎϤ¹¤ë·ÁÂÖ¤òÁªÂò¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "½ÐÎϤÎÄ´À°..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "¥«¥é¡¼¥Ð¥é¥ó¥¹¡¢ÌÀ¤ë¤µ¡¢¥³¥ó¥È¥é¥¹¥È¡¢ºÌÅ٤ȥǥ£¥¶¥ê¥ó¥°Êý¼°¤òÄ´À°¤·¤Þ¤¹¡£"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "ñ°Ì:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "ñ°Ì:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "°õºþ»þ¤Î´ðËÜñ°Ì¤òÁªÂò¤·¤Þ¤¹¡£"
 
@@ -4771,12 +4995,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "°õºþ"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "¥×¥ê¥ó¥¿¤ÎÁªÂò"
@@ -4826,68 +5050,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "¥×¥ê¥ó¥¿¤ÎÀßÄê"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "½ÐÎϤμïÎà:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "¥³¥Þ¥ó¥É:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "¥È¥ì¥¤£±"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "¥È¥ì¥¤£²"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "¥È¥ì¥¤£³"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "¥È¥ì¥¤£´"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "¥Æ¥¹¥È°õºþ"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Japanese"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISO ¥é¥Æ¥ó£±"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5159,18 +5383,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "%s ¤«¤éÆɤ߹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "%s ¤òÆɤ߽ñ¤­¥â¡¼¥É¤Ç³«¤±¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó; %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5179,7 +5403,7 @@ msgstr ""
 "\n"
 "%s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5197,83 +5421,84 @@ msgstr ""
 "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò¸¡½Ð¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤òÆÃÄꤹ¤ë¤¿¤á¤Ë '-m' ¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "¥×¥ê¥ó¥¿¤«¤é¤Î½ÐÎϤò²òÀϤǤ­¤Þ¤»¤ó\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "¥×¥ê¥ó¥¿¤Ï¥«¥é¡¼°õºþ¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "¥¤¥ó¥¯¤Î¿§"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "»Ä¤ê¤Î³ä¹ç"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤ËɬÍפʥ¤¥ó¥¯¡¦¥ì¥Ù¥ë¤ò¼èÆÀ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Äã¥ì¥Ù¥ë¡¦¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¥×¥ê¥ó¥¿¼±Ê̻Ҥ¬É¬ÍפǤ¹¡£\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "¥×¥ê¥ó¥¿¤Î·¿¼°¤ò°ì¤Ä»ØÄꤹ¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "¥Ø¥Ã¥É¤ÎÀ¶ÁÝÃæ...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "¥Î¥º¥ë¤ò¥Á¥§¥Ã¥¯¤·¤Þ¤¹¡£¥×¥ê¥ó¥¿¤ÎÃæ¤ËÍѻ椬³Î¼Â¤Ë¸ºß¤·¤Æ¤¤¤ë¤³¤È¤ò³Îǧ¤·¤Æ"
 "²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5349,7 +5574,7 @@ msgstr ""
 "¤¢¤È¤Ç¤½¤ÎÀßÄê¤òÊݸ¤·¤¿¤¤¾ì¹ç¤Ï¡¢¤â¤¦°ìÅÙƱ¤¸¼ê½ç¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5415,12 +5640,12 @@ msgstr ""
 "¤µ¤¤¡£\n"
 "¤³¤Îºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤ëºÇÃæ¤ËÅŸ»¤ò OFF ¤Ë¤·¤Ê¤¤¤Ç²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "¥×¥ê¥ó¥¿¤Ë¥³¥Þ¥ó¥É¤òÁ÷¿®¤Ç¤­¤Þ¤»¤ó¡£½ªÎ»¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5439,19 +5664,19 @@ msgstr ""
 "ÁªÂò¸å¤ËºÇ¸å¤Î³Îǧ¤¬¤¢¤ê¤Þ¤¹¡£\n"
 "ÁªÂò¤·¤Æ²¼¤µ¤¤ (s, q, r)¡£\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr "ËÜÅö¤ËÀßÄê¤òÇË´þ¤·¤Æ½ªÎ»¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 'q' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5460,19 +5685,19 @@ msgstr ""
 "¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤¬ÊäÀµ¤µ¤ì¤Þ¤·¤¿¡£Ã¢¤·¤½¤Î´Ö³Ö¤Ï¤Þ¤ÀÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 "¤½¤Î´Ö³Ö¤òÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢¤³¤Î¼ê½ç¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr "ËÜÅö¤Ë´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¤ä¤êľ¤¹¾ì¹ç¤Ï¡¢ºÆÅÙ 'r' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò·«¤êÊÖ¤·¤Þ¤¹¡£\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5488,17 +5713,17 @@ msgstr ""
 "¤³¤ÎÀßÄê¤ò¤ª»È¤¤¤Î¥×¥ê¥ó¥¿¤ËÊݸ¤¹¤ë¾ì¹ç¤Ï¡¢ºÆÅÙ 's' ¤òÆþÎϤ·¤Æ²¼¤µ¤¤:\n"
 "\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "ÀßÄê¤ÎÊݸ¤¹¤ë¤³¤È¤Ë¤Ä¤¤¤Æ..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "¼ºÇԤǤ¹¡ª\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5507,27 +5732,27 @@ msgstr ""
 "¤¢¤Ê¤¿¤ÎÀßÄê¤ÎÊݸ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
 "ºÆÅÙ¡¢´Ö³ÖÊäÀµ¤ÎÀßÄê¤ò¹Ô¤Ã¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "´°Î»¤·¤Þ¤·¤¿¡ª\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "´Ö³ÖÊäÀµ¤ÎÀßÄ꤬¥×¥ê¥ó¥¿¤ËÊݸ¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "ǧ¼±¤Ç¤­¤Ê¤¤¥³¥Þ¥ó¥É¤Ç¤¹¡£\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "ºÇ¸å¤Î¥³¥Þ¥ó¥É¤¬³Îǧ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5544,12 +5769,12 @@ msgstr ""
 "°õºþ¥Ø¥Ã¥É´Ö³ÖÊäÀµ¤ò³«»Ï¤¹¤ë¾ì¹ç¤Ï¡¢¥×¥ê¥ó¥¿¤Î¥È¥ì¥¤¤Ë\n"
 "ÍÑ»æ¤òÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "²¿¤«¥­¡¼¤òÆþÎϤ¹¤ë¤È³¹Ô¤·¤Þ¤¹ > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5560,42 +5785,42 @@ msgstr ""
 "¤½¤Î¥Ú¥¢¤ÎÈÖ¹æ¤òÆþÎϤ«¡¢'r' ¤Ç¤³¤ÎÀßÄê¤ò¤¯¤ê¤«¤¨¤¹¤«¡¢'?' ¤Ç¥Ø¥ë¥×¤òɽ¼¨¤·¤Þ"
 "¤¹¡£\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "¥Ñ¥¹ #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "¿·¤·¤¤ÍÑ»æ¤ò¥È¥ì¥¤¤ËÆþ¤ì¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èϰϳ°¤Î¥Ú¥¢ÈÖ¹æ¤Ç¤¹¡ª\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "ÆþÎϤ·¤¿¤â¤Î¤Ï̵¸ú¤Ç¤¹¡ª\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "ºÇŬ¤Ê¥é¥¤¥ó¤Î¥Ú¥¢¤Ï 1 ¤È %d ¤Î´Ö¤ÎÈÖ¹æ¤Ë¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "´Ö³ÖÊäÀµÃæ..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "´°Î»¤·¤Þ¤·¤¿¡£\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5608,7 +5833,7 @@ msgstr ""
 "¤â¤·ºÇŬ¤Ê¥Ñ¥¿¡¼¥ó¤Ç¤Ê¤¤¾ì¹ç¤Ï¡¢ºÇŬ¤Ê°õºþÉʼÁ¤òÆÀ¤ë¤¿¤á¤Ë\n"
 "ƱÍͤÎÁàºî¤ò·«¤êÊÖ¤·¤Æ²¼¤µ¤¤¡£\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "ÆþÎÏ¥¨¥é¡¼\n"
diff --git a/po/nb.gmo b/po/nb.gmo
index 9896526..5e8ce67 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index b48cee3..5ade1f1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print 0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-07-01 19:36+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian/Bokmaal <no@li.org>\n"
@@ -73,16 +73,16 @@ msgstr ""
 msgid "Density"
 msgstr "Tetthet:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -132,312 +132,312 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Dither-algoritme"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "1200 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Gjennomsiktighet"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Konvolutt"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Høyoppløsningspapir"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "Overføring til T-skjorte"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Glansete fotokort"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Profesjonelt fotopapir"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Annet"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Størrelse"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Innstillinger for parametere"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Medietype"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Mediekilde"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Oppløsning og kvalitet på utskriften"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Blekktype"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type blekk i skriveren"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -447,74 +447,82 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Raskt heltall"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Vanlig papir"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Tetthet:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -522,18 +530,18 @@ msgstr ""
 msgid "Light Cyan Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -541,56 +549,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Lys magenta"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr ""
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manuell med pause"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manuell uten pause"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Matt papir"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Sort"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY-farge"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK-farge"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Foto CcMmY-farge"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK-farge"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farger"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -631,9 +659,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -658,415 +686,430 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Avbryt"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Bildetype"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Bildetype"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Lysstyrke:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Sett høyde for utskriften"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Gul"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
 msgstr ""
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Gråtoner"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Gul"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
 msgstr ""
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Metning:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Blekktype"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Utskriftstype:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Avbryt"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Sort"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Gul"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Metning:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1157,133 +1200,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Autovelg"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Høyde:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Lys magenta"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Sort"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gul"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matt papir"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapir"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanset film"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Sort"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1352,11 +1401,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1497,104 +1546,105 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Lys cyan"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut til fil?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utskriftstype:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Størrelse"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Skriver støtter ikke fargeutskrift\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1648,141 +1698,152 @@ msgid "test print"
 msgstr "testutskrift"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Glanset film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Konvolutter"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Papir for blekkskriver"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papir med fotokvalitet for blekkskriver"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Fotopapir"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanset film"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Matt papir"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Sort-hvitt"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -1862,14 +1923,6 @@ msgstr "600x600 DPI monokrom"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -1878,27 +1931,17 @@ msgstr ""
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD fil:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD/Fil?"
@@ -1907,166 +1950,184 @@ msgstr "PPD/Fil?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Gråtoner"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Gråtoner"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Farge"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Farge"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Postkort"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Glanset fotopapir"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Vanlig papir"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matt papir"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2130,67 +2191,77 @@ msgstr "150x150 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "150x150 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "1200 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivernavn:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Lysstyrke:"
@@ -2894,1313 +2965,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 770"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Tomme"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Sett basis måleenhet til centimeter"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Sett basis måleenhet til centimeter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Sett basis måleenhet til tommer"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Fargeutskrift"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Kommando:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Skriv ut v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4208,7 +4432,7 @@ msgstr ""
 "Skriv ut og\n"
 "lagre innstillinger"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4216,15 +4440,15 @@ msgstr ""
 "Lagre\n"
 "innstillinger"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4238,252 +4462,252 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Størrelse:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Bredde:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Høyde:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Høyde på papiret du skal skrive ut på"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Posisjon"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Portrett"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Opp-ned"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Landskap"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Venstre:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Avstand fra venstre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Høyre:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Avstand fra venstre kant av arket til høyre kant av bildet"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Avstand fra høyre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Øverst:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Avstand fra toppen av arket til bildet"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Nederst:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Avstand fra toppen av arket til nedre kant av bildet"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Avstand fra nedre kant av arket til bildet"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Sentrer:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horisontalt"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Sentrer bildet horisontalt på arket"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Begge"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Sentrer bildet på arket"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikalt"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Sentrer bildet vertikalt på arket"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Sett opp skriver"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Raskt heltall"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Velg din skrivermodell"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD fil:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Bla gjennom"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Velg korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Skriv inn korrekt PPD-filnavn for din skriver"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "testutskrift"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Skriv ut til fil?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Definer ny skriver"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Skrivernavn:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Skriv inn navnet du ønsker å gi til denne logiske skriveren"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Om Gimp-Print"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print versjon "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid ""
 "\n"
 "\n"
@@ -4507,84 +4731,84 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Innstillinger for parametere"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Sett opp skriver..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Ny skriver..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Størrelse"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Skalering"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Sett skalering (størrelse) på bildet"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Prosent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Skaler utskriften til størrelsen på papiret"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skaler utskriften til antall punkter per tomme"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Sett bredde på utskriften"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Sett høyde for utskriften"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4592,67 +4816,67 @@ msgstr ""
 "Bruk opprinnelig\n"
 "bildestørrelse"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Sett størrelsen på utskriften til størrelsen på bildet"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Sett til standardverdier"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Lukk"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Forhåndsvisning av bilde"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Utskriftstype:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Velg ønsket type for utdata"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Juster utskrift..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr ">"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Velg basis måleenhet for utskrift"
 
@@ -4685,12 +4909,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Sett opp skriver"
@@ -4740,68 +4964,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Innstillinger for parametere"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Utskriftstype:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Skuff 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Skuff 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Skuff 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Skuff 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "testutskrift"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Norwegian"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -4975,18 +5199,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan ikke lese fra %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan ikke åpne %s med lese-/skriverettigheter: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -4995,7 +5219,7 @@ msgstr ""
 "\n"
 "Kan ikke skrive til %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5013,81 +5237,82 @@ msgstr ""
 "Kan ikke finne skrivertype.\n"
 "Vennligst bruk -m for å spesifisere din skrivermodell.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Kan ikke tolke utskrift fra skriver\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Skriver støtter ikke fargeutskrift\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Blekkfarge"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Prosent gjenstående"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å hente blekknivå.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Du må bruke en rå enhet for å identifisere skriveren.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan kun oppgi én skrivermodell."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Renser hoder...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Kjører «nozzle»-sjekk, sjekk at det er papir i skriveren.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5126,7 +5351,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5162,12 +5387,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan ikke sende kommando til skriveren, avslutter.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5179,20 +5404,20 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Vennligst bekreft at du vil avslutte uten å lagre ved å skrive «q» igjen:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5201,7 +5426,7 @@ msgstr ""
 "OK, skriveren er justert, men justeringen er ikke lagret.\n"
 "Hvis du ønsker å lagre justeringen må d\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5210,12 +5435,12 @@ msgstr ""
 "Vennligst bekreft at du vil gjenta justeringsprosessen ved å\n"
 "skrive «r»:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Gjentar justeringsprosessen.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5225,44 +5450,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "I ferd med å lagre innstillinger..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "feilet!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "fullført!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Innstillingene for justering er lagret til skriveren.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Kommandoen ble ikke gjenkjent.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Siste kommando ble ikke bekreftet.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5273,12 +5498,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Trykk linjeskift for å fortsette > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5286,42 +5511,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Gjennomgang #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vennligst sett inn et nytt ark.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Tallet er utenfor gyldig område!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Kan ikke forstå det du skrev inn!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Prøver å sette justering..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "fullført.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5330,7 +5555,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Feil i inndata\n"
diff --git a/po/nl.gmo b/po/nl.gmo
index f21dee8..2d586c7 100644
--- a/po/nl.gmo
+++ b/po/nl.gmo
diff --git a/po/nl.po b/po/nl.po
index fe10926..0f1f018 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gimp-print 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-03-15 20:31+0100\n"
 "Last-Translator: Hylke Witjens <hylke@wwd.nl>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -76,16 +76,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densiteit:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -137,312 +137,312 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr ""
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Blank papier"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Blank papier"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Transparanten"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Envelop"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Hoog-resolutie papier"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T-Shirt doordrukken"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Hoogglans papier"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Glanzend fotopapier"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Glanzende fotokaarten"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Professioneel fotopapier"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Overige"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Grootte"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Printerinstellingen"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Grootte van het papaier waarop je wenst te printen"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Medium Type"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Medium Bron"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolutie en kwaliteit van de afdruk"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Inkt type"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Type inkt van de printer"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -452,78 +452,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Printer model:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Blank papier"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densiteit:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densiteit:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densiteit:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -531,18 +539,18 @@ msgstr "Pas de hoeveelheid cyaan aan"
 msgid "Light Cyan Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -550,56 +558,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Licht Magenta"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Automatische papierlader"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Handmatig met pauze"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Handmatig zonder pauze"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Mat papier"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Zwart"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY kleuren"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK Kleuren"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Foto CcMmY kleuren"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Foto CcMmYK Kleuren"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Kleur"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -640,9 +668,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Afdrukken"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Grijswaarden"
 
@@ -667,422 +695,437 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Annuleren"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Beeldtype"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Beeldtype"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Beeldtype"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 msgid "Output image type"
 msgstr ""
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Helderheid:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Geef de hoogte van de afdruk"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Contrast"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Handmatig"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyaan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Geel"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Grijswaarden"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Gekleurdheid:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Inkt type"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 msgid "Output Curves"
 msgstr ""
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Annuleren"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Zwart"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Geel"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Gekleurdheid:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1173,133 +1216,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standaard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Rolinvoer"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Handmatig"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatisch Selecteren"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Hoogte: "
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Foto"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Zes kleuren foto"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Licht Magenta"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Zwart"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Geel"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Mat papier"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapier"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glanzende laag"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Zwart"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1369,11 +1418,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1521,105 +1570,106 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Licht Cyaan"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Handmatig"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Grootte"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI unidirectioneel"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Printer ondersteund geen kleuren\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1673,144 +1723,155 @@ msgid "test print"
 msgstr "Test afdruk"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Vier kleuren standaard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Drie kleuren composiet"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Zes kleuren foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Vijf kleuren foto composiet"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Glanzende laag"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Enveloppen"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Inkjet-papier"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Fotokwaliteit Inkjet-papier"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Fotopapier"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Premium Luster Photo Papier"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Fotokwaliteit glanzend papier"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Ilford Heavy Paper"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Glanzende laag"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Mat papier"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Pas de hoeveelheid cyaan aan"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Pas de hoeveelheid magenta aan"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Pas de hoeveelheid geel aan"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Zwart en Wit"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Pas de hoeveelheid cyaan aan"
@@ -1891,14 +1952,6 @@ msgstr "600x600 DPI monochrome"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Kleur + Zwarte patronen"
@@ -1907,27 +1960,17 @@ msgstr "Kleur + Zwarte patronen"
 msgid "Color + Photo Cartridges"
 msgstr "Kleur + Foto patronen"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD Bestand:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD Bestand?"
@@ -1936,165 +1979,183 @@ msgstr "PPD Bestand?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Grijswaarden"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Grijswaarden"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Zes kleuren verbeterd composiet"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Zes kleuren foto"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Vier kleuren standaard"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Drie kleuren composiet"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Drie kleuren composiet"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Vier kleuren standaard"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Vier kleuren standaard"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Zes kleuren verbeterd composiet"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Zeven kleuren verbeterd"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Zes kleuren foto"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Zes kleuren foto"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Blak papier snellader"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Briefkaart"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Mat papier"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premium glanzend fotopapier"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Blank papier"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Mat papier"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2162,68 +2223,78 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Hoogste kwaliteit"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Printer Naam:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Printer Naam:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Helderheid:"
@@ -2926,1309 +2997,1462 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Duim"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Afdrukken"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standaard"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Opdracht:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Bestand"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Info"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4236,7 +4460,7 @@ msgstr ""
 "Afdrukken en\n"
 "instellingen opslaan"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4244,15 +4468,15 @@ msgstr ""
 "Instellingen\n"
 "opslaan"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Voorbeeld"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4266,201 +4490,201 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Grootte"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Afmetingen"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Breedte: "
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Breedte van het papier waarop je wenst te printen"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Hoogte: "
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Hoogte van het papier waarop je wenst te printen"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Grootte"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Positie"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Landschap"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Ondersteboven"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 #, fuzzy
 msgid "Orientation:"
 msgstr "Gekleurdheid:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Links:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Afstand vanaf de linkerkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr ""
 "Afstand vanaf de linkerkant van het papier tot de rechterkant van de afdruk"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Afstand vanaf de rechterkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Boven:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Onder:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Afstand vanaf de bovenkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Afstand vanaf de onderkant van het papier tot de afdruk"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Midden X:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horzintaal"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centreer het plaatje horizontaal op het papier"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Beide"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centreer het plaatje op het papier"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centreer het plaatje verticaal op het papier"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Stel Printer in"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Printer Naam:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Selecteer jouw printer model"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Printer model:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Selecteer jouw printer model"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD Bestand:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Bladeren"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Kies de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4469,54 +4693,54 @@ msgstr ""
 "Selecteer de naam van de printer (Niet het type, of model, of printer) "
 "waarna je wenst te printen"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Printer Naam:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Geef de juiste PPD bestandsnaam voor jouw printer"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "Test afdruk"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Afdrukken Naar Bestand"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Stel nieuwe Printer in"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Printer Naam:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Info over Gimp-Print"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print Versie"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4561,11 +4785,11 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Printerinstellingen"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4573,11 +4797,11 @@ msgstr ""
 "Selecteer de naam van de printer (Niet het type, of model, of printer) "
 "waarna je wenst te printen"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Instellen Printer..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4585,129 +4809,129 @@ msgstr ""
 "Kies het printermodel, PPD bestand, en commando die gebruikt wordt om naar "
 "deze printer af te drukken."
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Nieuwe Printer..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Grootte"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Schaldn"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Geef de schaal (formaat) van het plaatje"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Geef de breedte van de afdruk"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Geef de hoogte van de afdruk"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Sluiten"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Afdruk voorvertoning"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Past uitvoer aan..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Eenheden"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr ">"
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Eenheden"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -4740,12 +4964,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Afdrukken"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Stel Printer in"
@@ -4795,67 +5019,67 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Printerinstellingen"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Opdracht:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Lade 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Lade 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Lade 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Lade 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Test afdruk"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Dutch"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5050,18 +5274,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan niet lezen van %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan %s niet openen lezen/schrijven: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan niet schrijven naar %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5070,7 +5294,7 @@ msgstr ""
 "\n"
 "Kan niet schrijven naar %s:%s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5088,83 +5312,84 @@ msgstr ""
 "Kan printer type niet vaststellen.\n"
 "Gebruik asjeblief -m om je printermodel te specificeren.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Printer status heeft een raw device nodig.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Kan de uitvoer van de printer niet verwerken\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Printer ondersteund geen kleuren\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Kleureninkt"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Overblijvend percentage"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Printer status heeft een raw device nodig.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "U mag maar een printermodel specificeren"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Bezig met het schoonmaken van de koppen..\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Bezig met nozzle check, let er astublief op, dat er papier in de printer "
 "zit.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5242,7 +5467,7 @@ msgstr ""
 "It is essential that you not turn your printer off during this procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5320,12 +5545,12 @@ msgstr ""
 "tijdens deze procedure.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Niet mogelijk om commando's naar de printer te sturen, eindigd.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5337,19 +5562,19 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr ">"
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5358,19 +5583,19 @@ msgstr ""
 "OK, je printer is uitgelijnt, maar de uitlijnen is niet bewaard.\n"
 "Als je de uitlijning wilt bewaren, moet je het proces herhalen.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Herhaal de uitlijn procedure.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5380,17 +5605,17 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Bezig met schrijven van instellingen..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "Gefaalt!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5399,27 +5624,27 @@ msgstr ""
 "Je instellingen werden niet succesvol weggeschreven. Je moet de\n"
 "uitlijn procedure herhalen.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "Gelukt!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, fuzzy, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Je uitlijn instellingen zijn bewaard door de printer.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Onbekend commando.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Laatste commando is niet bevestigd.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5430,12 +5655,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Druk enter om door te gaan >"
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5446,42 +5671,42 @@ msgstr ""
 "patroon.\n"
 "Tik een paar-nummer, '?' voor hulp, or 'r' om de procedure te herhalen.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Voer astublief een nieuw vel papier in.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Nummer valt buiten bereik!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Ik begrijp wat je zonet ingetikt hebt niet!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Het beste paar lijnen zou genummerd moeten zijn tussen 1 en %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Probeert uitlijning in te stellen."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "gelukt.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5494,7 +5719,7 @@ msgstr ""
 "lijn patroon %d is. Als het dat niet is, zul je de procedure moeten\n"
 "herhalen om de beste kwaliteit te krijgen.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr ""
diff --git a/po/pl.gmo b/po/pl.gmo
index e23e682..8f59c1e 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index af40e86..6796d76 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2001-10-18 11:53+0100\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -80,16 +80,16 @@ msgstr ""
 msgid "Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -139,311 +139,311 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algorytm ditherowania"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "1440 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "1440 x 360 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Przezroczyste"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Koperta"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr ""
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr ""
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr ""
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr ""
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Inne"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Rozmiar"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Ustawienia drukarki"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr ""
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr ""
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr ""
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr ""
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Rozdzielczo¶æ"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr ""
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr ""
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -453,147 +453,174 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model drukarki:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Zwyk³y papier"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr ""
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurowy"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr ""
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr ""
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Gêsto¶æ:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr ""
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr ""
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+msgid "Cassette"
+msgstr ""
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Czarny"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr ""
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr ""
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Kolor"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -633,9 +660,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Wydrukuj"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Odcienie szaro¶ci"
 
@@ -660,415 +687,430 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Anuluj"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Typ obrazu"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Typ obrazu"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Jasno¶æ:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Rozdzielczo¶æ"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
 msgstr ""
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Niebieskozielony"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
 msgstr ""
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
 msgstr ""
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr ""
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 msgid "Adjust the red gamma"
 msgstr ""
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 msgid "Adjust the green gamma"
 msgstr ""
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
 msgstr ""
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
 msgstr ""
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Nasycenie:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
 msgstr ""
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Typ tuszu:"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Anuluj"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Purpurowy"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Czarny"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "¯ó³æ"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Nasycenie:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1156,129 +1198,135 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr ""
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 msgid "Manual Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Wysoko¶æ:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Purpurowy"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "¯ó³æ"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Czarny"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 msgid "Gloss Optimizer"
 msgstr ""
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Czarny"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1347,11 +1395,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1489,101 +1537,102 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+msgid "Light Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:516
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
-msgid "Light Gray Transition"
-msgstr ""
-
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Rozmiar"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1637,138 +1686,149 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr ""
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr ""
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Koperty"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr ""
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 msgid "Glossy"
 msgstr ""
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 msgid "Black Balance"
 msgstr ""
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
 msgstr ""
 
@@ -1848,14 +1908,6 @@ msgstr ""
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -1864,27 +1916,17 @@ msgstr ""
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "Plik PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "Plik PPD?"
@@ -1893,163 +1935,181 @@ msgstr "Plik PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "Odcienie szaro¶ci"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Odcienie szaro¶ci"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 #, fuzzy
 msgid "Seven Color Enhanced"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Stylus Color Pro"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Jednolite p³aszczyzny"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Stylus Color Pro"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Jednolite p³aszczyzny"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Stylus Photo"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 #, fuzzy
 msgid "Plain Paper Fast Load"
 msgstr "Zwyk³y papier"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr ""
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 msgid "Premium Semigloss Photo Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Zwyk³y papier"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 msgid "Archival Matte Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2112,67 +2172,77 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 msgid "2880 x 720 DPI Highest Quality"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Ustawienia drukarki"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jasno¶æ:"
@@ -2874,1309 +2944,1462 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Cal"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr ""
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Standard Command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Polecenie:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Plik"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Ustaw domy¶lne"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Drukowanie v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Informacje o"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4184,7 +4407,7 @@ msgstr ""
 "Ustawienia drukowania\n"
 "i zapisu"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4192,15 +4415,15 @@ msgstr ""
 "Zapisz\n"
 "ustawienia"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Podgl±d"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4214,249 +4437,249 @@ msgid ""
 "to its original position."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Szeroko¶æ:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Wysoko¶æ:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Po³o¿enie"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Portret"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Pejza¿"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Z góry na dó³"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Pejza¿"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "U³o¿enie:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Lewa:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Odleg³o¶æ od lewej krawêdzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Prawa:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Odleg³o¶æ od lewej krawêdzi papieru do prawej krawêdzi obrazu"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Odleg³o¶æ od prawej krawêdzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Góra:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Odleg³o¶æ od górnej krawêdzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Dó³:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Odleg³o¶æ od górnej krawêdzi papieru do dolnej krawêdzi obrazu"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Odleg³o¶æ od dolnej krawêdzi papieru do obrazu"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Oba"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Pionowo"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "Plik PPD:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Przegl±daj"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Model drukarki:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 msgid "Enter the correct command to print to your printer. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Wydrukowaæ do pliku?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid ""
 "\n"
 "\n"
@@ -4480,149 +4703,149 @@ msgid ""
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Ustawienia drukarki"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr ""
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Rozmiar"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Skalowanie:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Regulacja koloru wydruku"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Ustaw domy¶lne"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Zamknij"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Podgl±d obrazu"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Jednostki:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr ""
 
@@ -4655,12 +4878,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Wydrukuj"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Ustawienia drukarki"
@@ -4710,64 +4933,64 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Ustawienia drukarki"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ wyj¶ciowy:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Polecenie:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Wydrukuj"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Polish"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin2"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -4941,18 +5164,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -4961,7 +5184,7 @@ msgstr ""
 "\n"
 "Nie mo¿na zapisaæ do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -4976,81 +5199,82 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Do uzyskania stanu drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Nie mo¿na wydrukowaæ na drukarce %s przy u¿yciu %s\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr ""
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Do zidentyfikowania drukarki nale¿y u¿yæ surowego urz±dzenia.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Mo¿na podaæ tylko jeden model drukarki."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Czyszczenie g³owic...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5089,7 +5313,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5125,12 +5349,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5142,38 +5366,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr ""
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5183,44 +5407,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr ""
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5231,12 +5455,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr ""
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5244,42 +5468,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr ""
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5288,7 +5512,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr ""
diff --git a/po/pt.gmo b/po/pt.gmo
index f4f57f9..906ed28 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index 6f5190d..7e6a140 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimpprint 4.3.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-10-16 19:24+0100\n"
 "Last-Translator: Filipe Maia <fmaia@gmx.net>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -76,16 +76,16 @@ msgstr ""
 msgid "Density"
 msgstr "Densidade:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -146,313 +146,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmos de \"Dither\"\""
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Papel Normal"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Papel Normal"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Transparências"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Filme de impressão por trás"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Folhas de Fábrica"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Envelope"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Papel de Alta Resolução"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "Transferências para T-Shirt"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Filme Muito Lustroso"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Cartões de Fotografia Lustrosos"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Papel de Fotografia Profissional"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Outro"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Tamanho"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Definições da Impressora"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Tamanho do papel para o qual deseja imprimir"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Tipo de Média"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Fonte de Média"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Fonte do \"media\" para o qual está a imprimir"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Resolução"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Resolução e qualidade da impressão"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Tipo de tinta"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Tipo de tinta na impressora"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -462,78 +462,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Modelo da Impressora:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Papel ColorLife"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Densidade:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -541,18 +549,18 @@ msgstr "Ajustar o equilíbrio de ciano na impressão"
 msgid "Light Cyan Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -560,56 +568,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Magenta Claro"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Alimentador de Folhas Automático"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manual com Pausa"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manual sem Pausa"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Papel Mate"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Preto"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "Cor CMY"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "Cor CMYK"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Cor CcMmY de Fotografia"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Cor CcMmYK de Fotografia<"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Cor"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -650,9 +678,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Imprimir"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Escala de Cinzento"
 
@@ -677,114 +705,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Cancelar"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Tipo de Imagem"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Tipo de Imagem"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gama:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Brilho:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Definir a altura da impressão"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Contraste:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -795,129 +832,135 @@ msgstr ""
 "escuras. Preto e branco mantêm-se inalterados, ou contrário do caso do "
 "ajustamento do brilho."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Ciano"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Escala de Cinzento"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Saturação:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -926,184 +969,184 @@ msgstr ""
 "Use saturação zero para produzir output em escala de cinzento usando tintas "
 "de cor e pretas"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Tipo de tinta"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Tipo de Output:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Cancelar"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Preto"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Amarelo"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Saturação:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1194,133 +1237,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Rolo de Alimentação"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manual"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Auto Seleccionar"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Altura"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Seis Cores Foto"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Magenta Claro"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Preto"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Amarelo"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Papel Mate"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Filme Lustroso"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Preto"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1390,11 +1439,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1543,106 +1592,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Ciano Claro"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Tipo de Output:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Tamanho"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Unidireccional"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "A impressora não suporta a cor de impressão\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1696,144 +1746,155 @@ msgid "test print"
 msgstr "impressão de teste"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Quatro Cores Standard"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Três Cores Compósito"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Seis Cores Foto"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Cinco Cores Foto Compósito"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Filme Lustroso"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Envelopes"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Papel para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papel de Qualidade Fotografica para Impressora Jacto de Tinta"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Papel de Fotografia"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Papel de Fotografia Brilhante Premium"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Papel de Qualidade Fotografica Lustroso"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Papel Pesado Ilford"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Filme Lustroso"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Papel Mate"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Ajustar o equilíbrio de magenta da impressão"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Ajustar o equilíbrio de amarelo na impressão"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Preto e Branco"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Ajustar o equilíbrio de ciano na impressão"
@@ -1914,14 +1975,6 @@ msgstr "600x600 DPI monocromático"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Cartuchos Cor + Preto"
@@ -1930,27 +1983,17 @@ msgstr "Cartuchos Cor + Preto"
 msgid "Color + Photo Cartridges"
 msgstr "Cartuchos Cor + Fotografia"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "Ficheiro PPD:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "Ficheiro PPD?"
@@ -1959,163 +2002,181 @@ msgstr "Ficheiro PPD?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "Escala de Cinzento de 2 Níveis"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Escala de Cinzento de 2 Níveis"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "Quato Tons"
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Seis Cores Foto"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Três Cores Compósito"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Três Cores Compósito"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Quatro Cores Standard"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Seis Cores Compósito Realçado"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Foto de Sete Cores"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sete Cores Realçado"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Seis Cores Foto"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Seis Cores Foto"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Papel Normal Carregação Rápida"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Cartão"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr "Película"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Papel de Fotografia Lustroso Premium"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Papel ColorLife"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Papel Mate"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2183,68 +2244,78 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Máxima Qualidade"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Nome da Impressora:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Brilho:"
@@ -2946,1313 +3017,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C41ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus c20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus c20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "Polegada"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Definir como base das unidades de medida o centímetro"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Definir como base das unidades de medida a polegada"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Ouput de cor"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Imprimir em sombras de cinzento usando tinta preta"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Comando:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Imprimir v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Acerca"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4260,21 +4484,21 @@ msgstr ""
 "Imprimir e\n"
 "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
 msgstr "Gravar Definições"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Previsualizar"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4302,76 +4526,76 @@ msgstr ""
 "sua\n"
 "posição original."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Dimensões:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Largura:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Largura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Altura"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Altura do papel para o qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Posição"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Auto"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Retrato"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Paisagem"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "De cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Paisagem de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
@@ -4379,124 +4603,124 @@ msgstr ""
 "Seleccione a orientação: retrato, paisagem, cabeça para baixo, ou paisagem "
 "de cabeça para baixo"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientação:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Esquerda:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Distância da esquerda do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Direita:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Distência da esquerda do papel até à direita da imagem"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Distância da direita do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Topo:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Distência do topo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Fundo:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Distância do topo do papel até ao fundo da imagem"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Distância do fundo do papel até à imagem"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centro:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horizontalmente"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centrar a imagem horizontalmente no papel"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Ambos"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centrar a imagem no papel"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Verticalmente"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centrar a imagem verticalmente no papel"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Configurar a Impressora"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Modelo da Impressora:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Seleccione o seu modelo de impressora"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "Ficheiro PPD:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Insira o ficheiro PPD correct para a sua impressora"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Navegar"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Seleccione o ficheiro PPD correcto para a sua impressora"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4505,54 +4729,54 @@ msgstr ""
 "Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
 "a qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Insira o ficheiro PPD correct para a sua impressora"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "impressão de teste"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Imprimir para o Ficheiro?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Definir nova Impressora"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Nome da Impressora:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Insira o noma que deseja dar a esta impressora lógica"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Acerca do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Versão do Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4597,11 +4821,11 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Definições da Impressora"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4609,11 +4833,11 @@ msgstr ""
 "Seleccione o nome da impressora (não o tipo ou modelo da impressora) para\n"
 "a qual deseja imprimir"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Configurar Impressora..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4622,11 +4846,11 @@ msgstr ""
 "imprimir\n"
 "para esta impressora"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Nova Impressora..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4634,24 +4858,24 @@ msgstr ""
 "Definir uma nova impressora lógica. Isto pode ser usado para denominar uma "
 "colecção de definições que você deseje guardar para uso futuro"
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Tamanho"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Redimesionamento:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Definir a escala (tamanho) da imagem"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4659,31 +4883,31 @@ msgstr ""
 "Seleccione se a escala é medida em percentagem do tamanho de página "
 "disponível ou número de pontos por polegada na impressão"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Precentagem"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Redimensionar a impressão para o tamanho da página"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Redimensionar a impressão para o número de pontos por polegada"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Definir a largura da impressão"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Definir a altura da impressão"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4691,69 +4915,69 @@ msgstr ""
 "Usar Original\n"
 "Tamanho de Imagem"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Definir como tamanho de impressão o tamanho da imagem"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Ajustamento da Cor de Impressão"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Definir Valores Padrão"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Fechar"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Previsualização da Imagem"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Tipo de Output:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Seleccione o tipo de output desejado"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Ajustar o Output..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Ajustar equilíbrio de cor, brilho, contraste, saturação e algoritmo de "
 "\"dither\""
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Unidades:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Seleccione a base das unidades de medida para impressão"
 
@@ -4786,12 +5010,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Imprimir"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Configurar a Impressora"
@@ -4841,68 +5065,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Definições da Impressora"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Tipo de Output:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Comando:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Tabuleiro 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Tabuleiro 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Tabuleiro 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Tabuleiro 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "impressão de teste"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Portuguese"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5171,18 +5395,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Não é possível ler a partir de %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Não foi possível abrir %s escrita/leitura: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5191,7 +5415,7 @@ msgstr ""
 "\n"
 "Não foi possível escrever para %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5209,82 +5433,83 @@ msgstr ""
 "Não foi possível detecar o tipo de impressora.\n"
 "Por favor use a opção -m para especificar o modelo da sua impressora.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Não é possivel processar o output da impressora\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "A impressora não suporta a cor de impressão\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Cor da Tinta"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Percentagem restante"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Obter níveis de tinta requere a utilização de um dipositivo.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identificação da impressora requere a utilização de um dispositivo.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Você só pode especificar um modelo de impressora"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Limpando as cabeças...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "A testar a agulha, por favor assegure-se que existe papel na impressora.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5369,7 +5594,7 @@ msgstr ""
 "procedimento.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5444,12 +5669,12 @@ msgstr ""
 "os resultados. É essencial que você não desligue a impressora durante este "
 "procedimento.\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Não foi possível enviar o comando para a impressora, saindo.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5468,20 +5693,20 @@ msgstr ""
 "Vai-lhe ser pedido para confirmar a sua escolha.\n"
 "O que é que pretende fazer (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Por favor confirme carregando em 'q' outra vez se deseja sair sem gravar:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5490,7 +5715,7 @@ msgstr ""
 "A sua impressora está alinhada, mas o alinhamento não foi gravado.\n"
 "Se deseja gravar o alinhamento, terá de repetir o processo.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5499,12 +5724,12 @@ msgstr ""
 "Por favor confirme, carregando em 'r' outra vez, que deseja repetir\n"
 "o processo de alinhamento:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Repetindo o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5519,17 +5744,17 @@ msgstr ""
 "Por favor confirme, carregando em 's' outra vez, que você deseja gravar\n"
 "as configurações para a sua impressora:\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Prestes a gravar as configurações..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "falhou!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5538,28 +5763,28 @@ msgstr ""
 "A suas configurações não foram gravados com sucesso.\n"
 "Vai ter de repetir o processo de alinhamento.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "sucesso!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 "As suas configurações do alinhamento foram gravadas para a impressora.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Comando desconhecido.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "O comando final não foi confirmado.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5576,12 +5801,12 @@ msgstr ""
 "Por favor coloque uma folha de papel na impressora para iniciar\n"
 "o processo de alinhamento da cabeça.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Pressione enter para continuar > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5592,42 +5817,42 @@ msgstr ""
 "padrão.\n"
 "Insira um par, '?' para ajuda, ou 'r' para repetir o procedimento.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Passagem #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Por favor insira uma nova folha de papel.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Número fora do intervalo|\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Eu não consigo intender o que escreveu!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "O melhor par de linhasdeve estar numerado entre 1 e %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Tentando definir o alinhamento..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "sucesso.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5642,7 +5867,7 @@ msgstr ""
 "é o padrão %d. Se não é, você deve repetir o processo para obter a melhor\n"
 "qualidade de impressão.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Erro no input\n"
diff --git a/po/sk.gmo b/po/sk.gmo
index 8881821..9b604f1 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 4809f0c..ca6ab78 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GIMP Print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-05-20 18:08+0100\n"
 "Last-Translator: Zdenko Podobný <zdpo@mailbox.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -79,16 +79,16 @@ msgstr ""
 msgid "Density"
 msgstr "Hustota:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -149,313 +149,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Algoritmus rozptylu"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 x 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 x 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 x 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 x 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400x600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Priesvitná fólia"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Normálny papier"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Obálka"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Papier s vysokým rozlí¹ením"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "Na¾ehµovacia fólia"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Vysokolesklý film"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Lesklý foto papier"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Lesklé foto karty"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Foto papier pro"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Iné"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Veµkos»"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Veµkos» papiera, na ktorý chcete tlaèi»"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Typ média"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Zdroj média"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Zdroj (vstupné miesto) média, na ktoré tlaèíte"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Rozlí¹enie"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Rozlí¹enie a kvalita tlaèe"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Typ atramentu"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ atramentu tlaèiarne"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -465,78 +465,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Model tlaèiarne:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "Obyèajný papier"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Purpurová"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Hustota:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -544,18 +552,18 @@ msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 msgid "Light Cyan Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -563,56 +571,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Jasná purpurová"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Automatický podávaè papiera"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manuálne s preru¹ením"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manuálne bez preru¹enia"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Matný papier"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Èierna"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY farba"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK farba"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "Fotografická CcMmY farba"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "Fotografická CcMmYK farba"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Farebne"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -653,9 +681,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Tlaèi»"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "V odtieòoch ¹edej"
 
@@ -680,114 +708,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Storno"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Typ obrázku"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Typ obrázku"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gama:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Jas:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Nastavi» vý¹ku tlaèe"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -797,129 +834,135 @@ msgstr ""
 "tlaè, kým ni¾¹ie hodnoty vyprodukujú tmav¹iu tlaè. Èierna a biela zostanú "
 "také isté na rozdiel od nastavovania jasu."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gama:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Azúrová"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "®ltá"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Sýtos»:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -928,184 +971,184 @@ msgstr ""
 "Pou¾ite nulu na vyprodukovanie výstupu v odtieòoch ¹edej s pou¾itím "
 "farebného a èierneho atramentu"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Typ atramentu"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Typ výstupu:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Storno"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Purpurová"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Èierna"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "®ltá"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Sýtos»:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1196,133 +1239,139 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "©tandardný"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Kotúèový podávaè"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuál"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Automatický výber"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Vý¹ka:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografia"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Jasná purpurová"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Èierna"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "®ltá"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matný papier"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotografický papier"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Lesklý film"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Èierna"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1392,11 +1441,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1545,106 +1594,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Jasná azúrová"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Tlaèi» do súboru?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Typ výstupu:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Veµkos»"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI Jednosmerne"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Tlaèiareò nepodporuje farebný výstup\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1698,144 +1748,155 @@ msgid "test print"
 msgstr "Test tlaèe"
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "©tandardný ¹tvorfarebný"
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Kompozitný trojfarebný"
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Kompozitný fotografický pä»farebný"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Lesklý film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Obálky"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Papier pre atramentovú tlaèiareò"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Papier s fotografickou kvalitou"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Fotografický papier"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Ligotavý foto papier Premium"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Lesklý fotografický papier"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Ilford »a¾ký papier"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Lesklý film"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Matný papier"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Prispôsobenie vyvá¾enie purpurovej farby pre tlaè"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Prispôsobenie vyvá¾enie ¾ltej farby pre tlaè"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Èiernobielo"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Prispôsobenie vyvá¾enie azúrovej farby pre tlaè"
@@ -1916,14 +1977,6 @@ msgstr "600x600 DPI monochromaticky"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Farebná + èierna kazeta"
@@ -1932,27 +1985,17 @@ msgstr "Farebná + èierna kazeta"
 msgid "Color + Photo Cartridges"
 msgstr "Farebná + Foto kazeta"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD súbor:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD súbor?"
@@ -1961,165 +2004,183 @@ msgstr "PPD súbor?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 #, fuzzy
 msgid "Two Level Grayscale"
 msgstr "V odtieòoch ¹edej"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "V odtieòoch ¹edej"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 #, fuzzy
 msgid "Seven Color Photo"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Fotografický ¹es»farebný"
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Kompozitný trojfarebný"
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "©tandardný ¹tvorfarebný"
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Kompozitný roz¹írený ¹es»farebný"
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Roz¹írený sedemfarebný"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Fotografický ¹es»farebný"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Fotografický ¹es»farebný"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Obyèajný papier rýchle nasadenie"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Pohµadnica"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Lesklý foto papier Premium"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "Obyèajný papier"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matný papier"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2187,68 +2248,78 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 x 360 DPI Najvy¹¹ia kvalita"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Názov tlaèiarne:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Jas:"
@@ -2951,1313 +3022,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "palce"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Nastavi» palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Nastavi» centimetre ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Tlaèi»"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Nastavi» palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Nastavi» centimetre ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Nastavi» palce ako základnú mernú jednotku"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Farebný výstup"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Tlaèi» v odtieòoch ¹edej s pou¾itím èiernej farby"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "©tandardný"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Príkaz:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Súbor"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Tlaèi» do súboru?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Storno"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Tlaè v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "O programe"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4265,7 +4489,7 @@ msgstr ""
 "Ulo¾i» nastavenia\n"
 "a vytlaèi»"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4273,15 +4497,15 @@ msgstr ""
 "Ulo¾i»\n"
 "nastavenia"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Tlaèi»"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Náhµad"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4305,200 +4529,200 @@ msgstr ""
 "Ak poèas »ahania obrázku my¹ou kliknete iným tlaèítkom, obrázok sa vráti na "
 "pôvodnú pozíciu."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Veµkos»"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Rozmery:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "©írka:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "©írka papiera, na ktorý chcete tlaèi»"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Vý¹ka:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Vý¹ka papiera, na ktorý chcete tlaèi»"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Veµkos»"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Pozícia"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Na vý¹ku"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Na ¹írku"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Hore nohami"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Na ¹írku"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 "Zvoµte orientáciu: na vý¹ku, na ¹írku, hore nohami, na ¹írku hore nohami "
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientácia:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "¥avý:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Vzdialenos» od µavého okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Pravý:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Vzdialenos» od µavého okraja papiera k pravému okraju obrázku"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Vzdialenos» od pravého okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Horný:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Vzdialenos» od horného okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Dolný:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Vzdialenos» od horného okraja papiera k dolnému okraju obrázku"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Vzdialenos» od dolného okraja papiera k obrázku"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centrovanie:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Vodorovne"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Vycentrova» vodorovne obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Oboje"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Vycentrova» obrázok na papieri"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Zvislo"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Vycentrova» obrázok zvisle na papieri"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Nastavi» tlaèiareò"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Názov tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Vyberte model va¹ej tlaèiarne"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Model tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Vyberte model va¹ej tlaèiarne"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD súbor:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Prechádza»"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Zvoµte správny PPD názov súboru pre va¹u tlaèiareò"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4507,54 +4731,54 @@ msgstr ""
 "Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
 "tlaèi»"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Názov tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Vlo¾te správny PPD názov súboru pre va¹u tlaèiareò"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "Test tlaèe"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Tlaèi» do súboru?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Definovanie novej tlaèiarne"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Názov tlaèiarne:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Vlo¾te oznaèenie, ktoré chcete da» tejto logickej tlaèiarni"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "O Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Verzia Gimp-Print"
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4600,11 +4824,11 @@ msgstr ""
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA.\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4612,11 +4836,11 @@ msgstr ""
 "Zvoµte si názov tlaèiarne (nie typ alebo model tlaèiarne), na ktorej chcete "
 "tlaèi»"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Nastavenie tlaèiarne..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4624,11 +4848,11 @@ msgstr ""
 "Voµba model tlaèiarne, PPD súboru a príkaz, ktorý sa pou¾íva pre tlaè na "
 "tejto tlaèiarni"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Nová tlaèiareò..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4636,24 +4860,24 @@ msgstr ""
 "Definovanie novej logickej tlaèiarne. Toto mô¾e by» pou¾ité na pomenovanie "
 "zbierky nastavení, ktoré si prajete zapamäta» a v budúcnosti pou¾íva»."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Veµkos»"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Zmena:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Nastavi» zväè¹enie (veµkos») obrázku"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4661,31 +4885,31 @@ msgstr ""
 "Zvoµte, èi zmena veµkosti bude vyjadrená ako percento dostupnej veµkosti "
 "stránky, alebo ako èíslo výstupného DPI"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Percentá"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Zmeni» veµkos» tlaèe podµa rozmerov strany"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Zmeni» veµkos» tlaèe podµa poètu bodov na palec"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Nastavi» ¹írku tlaèe"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Nastavi» vý¹ku tlaèe"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4693,68 +4917,68 @@ msgstr ""
 "Pou¾i» pôvodnú\n"
 "veµkos» obrázka"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Nastavenie veµkosti tlaèe na veµkos» obrázku"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Prispôsobenie farieb pre tlaè"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Nastavi» ¹tandardné"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Zatvori»"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Náhµad obrázku"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Typ výstupu:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Zvoµte vytú¾ený typ výstupu"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Prispôsobi» výstup..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Nastavenie farebného vyvá¾enia, kontrastu, sýtosti a algoritmu rozptylu"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Jednotky:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Zvoli» základnú mernú jednotku pre tlaè"
 
@@ -4787,12 +5011,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Tlaèi»"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Nastavi» tlaèiareò"
@@ -4842,68 +5066,68 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Nastavenie tlaèiarne"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Typ výstupu:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Príkaz:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Zásobník 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Zásobník 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Zásobník 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Zásobník 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "Test tlaèe"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Slovak"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5186,18 +5410,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Nie je mo¾né èíta» z %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Nie je mo¾né otvori» %s pre èítanie/zápis: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5206,7 +5430,7 @@ msgstr ""
 "\n"
 "Nie je mo¾né zapisova» do %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5224,81 +5448,82 @@ msgstr ""
 "Nie je mo¾né zisti» typ tlaèiarne.\n"
 "Pou¾ite prosím -m na urèenie modelu va¹ej tlaèiarne.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Nie je mo¾né analyzova» výstup z tlaèiarne\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Tlaèiareò nepodporuje farebný výstup\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Farebný atrament"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Zostávajúce percentá"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Získanie úrovne atramentu vy¾aduje pou¾itie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Identifikácia tlaèiarne vy¾aduje pou¾ívanie základného zariadenia.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Je mo¾né zvoli» len jeden model tlaèiarne."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Èistenie hláv...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr "Spú¹»am kontrolu trysiek, uistite sa, ¾e v tlaèiarni je papier.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5373,7 +5598,7 @@ msgstr ""
 "toho procesu nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5443,12 +5668,12 @@ msgstr ""
 "nevypli tlaèiareò\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Nie je mo¾né odosla» príkaz pre tlaèiareò, koniec.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5467,20 +5692,20 @@ msgstr ""
 "Potom bude po¾iadaný potvrdi» va¹u voµbu.\n"
 "Èo chcete spravi»? (s,q,r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Potvrïte prosím opätovným stlaèením 'q', ¾e si ¾eláte ukonèi» bez ulo¾enia:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5489,7 +5714,7 @@ msgstr ""
 "V poriadku, va¹a tlaèiareò je  zarovnaná, ale zarovnanie nebolo ulo¾ené.\n"
 "Ak si ¾eláte ulo¾i» zarovnanie, musíte tento proces zopakova».\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5498,12 +5723,12 @@ msgstr ""
 "Opätovným stlaèení 'r' potvrïte, ¾e si prajete zopakova» proces "
 "zarovnávania:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Opakujem proces zarovnávania.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5518,17 +5743,17 @@ msgstr ""
 "Potvrïte opätovným stlaèením 's', ¾e si prajete ulo¾i» nastavenie\n"
 "va¹ej tlaèiarne:\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "O nastaveniach ukladania..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "zlyhalo!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5537,27 +5762,27 @@ msgstr ""
 "Va¹e nastavenie sa nepodarilo úspe¹ne ulo¾i». Musíte zopakova»\n"
 "procedúru zarovnávania.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "úspe¹ne!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Va¹e nastavenia zarovnávania boli ulo¾ené do tlaèiarne.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Neznámy príkaz.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Závereèný príkaz nebol potvrdený.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5574,12 +5799,12 @@ msgstr ""
 "Vlo¾te prosím hárok papiera do va¹ej tlaèiarne, aby sa mohla zaèa»\n"
 "procedúra zarovnávania hlavy.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Pre pokraèovanie stlaète enter > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5589,42 +5814,42 @@ msgstr ""
 "Preskúmajte pozorne výtlaèok a zvoµte najlep¹í pár èiar v ka¾dej vzorke.\n"
 "Stlaète èíslo páru, '?' pre pomoc alebo 'r' pre zopakovanie procedúry.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Prechod #%d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Vlo¾te prosím nový hárok papiera.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Èíslo je mimo rozsahu!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Nedoká¾em pochopi», èo ste napísali!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Najlep¹í pár èiar by mal ma» èíslo z rozpätia 1 a %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Pokú¹am sa nastavi» zarovnávanie..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "úspe¹né.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5637,7 +5862,7 @@ msgstr ""
 "d. Ak nie je, mali by ste zopakova» tento proces, aby ste dostali najlep¹ie "
 "výsledky pri tlaèi.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Chyba na vstupe\n"
diff --git a/po/sv.gmo b/po/sv.gmo
index e18ecca..66aa5ad 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 0d5fa37..158128c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001, 2002.
 #
-# $Id: sv.po,v 1.74 2005/08/13 21:13:35 rlk Exp $
+# $Id: sv.po,v 1.75 2005/09/02 02:15:19 rlk Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-print\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2002-10-03 13:47+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -78,16 +78,16 @@ msgstr ""
 msgid "Density"
 msgstr "Intensitet:"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -148,313 +148,313 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "Färgutjämningsalgoritm"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 #, fuzzy
 msgid "90x90 DPI DMT"
 msgstr "600 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 #, fuzzy
 msgid "180x180 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 #, fuzzy
 msgid "360x360 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI"
 msgstr "720 × 360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 #, fuzzy
 msgid "720x360 DPI DMT"
 msgstr "720 × 360 DPI MW2"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 #, fuzzy
 msgid "720x720 DPI DMT"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI"
 msgstr "1440 × 720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 #, fuzzy
 msgid "1440x720 DPI DMT"
 msgstr "1440 × 720 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 #, fuzzy
 msgid "1440x1440 DPI DMT"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 #, fuzzy
 msgid "2880x2880 DPI DMT"
 msgstr "2880 × 720 DPI"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 #, fuzzy
 msgid "150x150 DPI DMT"
 msgstr "150×150 DPI"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 #, fuzzy
 msgid "300x300 DPI DMT"
 msgstr "300×300 DPI"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 #, fuzzy
 msgid "600x300 DPI DMT"
 msgstr "600×300 DPI"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 #, fuzzy
 msgid "600x600 DPI DMT"
 msgstr "600×600 DPI"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 #, fuzzy
 msgid "1200x600 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 #, fuzzy
 msgid "1200x1200 DPI DMT"
 msgstr "1200×600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 #, fuzzy
 msgid "2400x2400 DPI DMT"
 msgstr "2400×600 DPI"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "Vanligt papper"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "Vanligt papper"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "Genomskinligheter"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr "Bakutskriftsfilm"
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr "Tygark"
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "Kuvert"
 
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "Högupplösningspapper"
 
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T-shirttryck"
 
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "Högglansig film"
 
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "Glansigt fotopapper"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr "Glansiga fotokort"
 
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "Professionellt fotopapper"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "Annat"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 #, fuzzy
 msgid "Page Size"
 msgstr "Storlek"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 #, fuzzy
 msgid "Basic Printer Setup"
 msgstr "Skrivarinställningar"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 #, fuzzy
 msgid "Size of the paper being printed to"
 msgstr "Storlek på pappret som du vill skriva ut till"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "Mediatyp"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr ""
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "Mediakälla"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 #, fuzzy
 msgid "Source (input slot) of the media"
 msgstr "Källa (inmatningsfack) med media som du skriver ut till"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "Upplösning och kvalitet på utskriften"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "Bläcktyp"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr ""
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "Typ av bläck i skrivaren"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -464,78 +464,86 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr ""
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Printing Mode"
 msgstr "Skrivarmodell:"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 #, fuzzy
 msgid "Core Parameter"
 msgstr "ColorLife-papper"
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr ""
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 #, fuzzy
 msgid "Cyan Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 #, fuzzy
 msgid "Adjust the cyan density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 #, fuzzy
 msgid "Magenta Density"
 msgstr "Magenta"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 #, fuzzy
 msgid "Adjust the magenta density"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 #, fuzzy
 msgid "Yellow Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 #, fuzzy
 msgid "Adjust the yellow density"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 #, fuzzy
 msgid "Black Density"
 msgstr "Intensitet:"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 #, fuzzy
 msgid "Adjust the black density"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
@@ -543,18 +551,18 @@ msgstr "Justera cyanbalansen på utskriften"
 msgid "Light Cyan Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
@@ -562,56 +570,76 @@ msgstr ""
 msgid "Light Magenta Transition"
 msgstr "Ljus magenta"
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 #, fuzzy
 msgid "Light Yellow Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "Automatisk arkmatare"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr "Manuell med paus"
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr "Manuell utan paus"
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+#, fuzzy
+msgid "Cassette"
+msgstr "Matte-papper"
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "Svart"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY-färg"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK-färg"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr "CcMmY-fotofärg"
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr "CcMmYK-fotofärg"
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "Färg"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 #, fuzzy
@@ -652,9 +680,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr "Skriv ut"
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -679,114 +707,123 @@ msgstr ""
 msgid "KCMY"
 msgstr ""
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 #, fuzzy
 msgid "Channel "
 msgstr "Avbryt"
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 #, fuzzy
 msgid " Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 #, fuzzy
 msgid "Gamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr ""
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 #, fuzzy
 msgid "Input Image Type"
 msgstr "Bildtyp"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 #, fuzzy
 msgid "Input image type"
 msgstr "Bildtyp"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 #, fuzzy
 msgid "Output Image Type"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 #, fuzzy
 msgid "Output image type"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma:"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 #, fuzzy
 msgid "Brightness"
 msgstr "Ljusstyrka:"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 #, fuzzy
 msgid "Brightness of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 #, fuzzy
 msgid "Contrast"
 msgstr "Kontrast:"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 #, fuzzy
 msgid "Advanced Image Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 #, fuzzy
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
@@ -797,129 +834,135 @@ msgstr ""
 "utskrift. Svart och vitt kommer att vara samma, till skillnad från då "
 "ljusstyrkeinställningen används."
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 #, fuzzy
 msgid "AppGamma"
 msgstr "Gamma:"
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr ""
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "Cyan"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 #, fuzzy
 msgid "Adjust the cyan gamma"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "Magenta"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 #, fuzzy
 msgid "Adjust the magenta gamma"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "Gult"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 #, fuzzy
 msgid "Adjust the yellow gamma"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr ""
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 #, fuzzy
 msgid "Adjust the red gamma"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr ""
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 #, fuzzy
 msgid "Adjust the green gamma"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr ""
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 #, fuzzy
 msgid "Adjust the blue gamma"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 #, fuzzy
 msgid "Adjust the black gamma"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr ""
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 #, fuzzy
 msgid "GrayBalance"
 msgstr "Gråtoner"
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 #, fuzzy
 msgid "Adjust the cyan gray balance"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 #, fuzzy
 msgid "Magenta Balance"
 msgstr "Magenta"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 #, fuzzy
 msgid "Adjust the magenta gray balance"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 #, fuzzy
 msgid "Yellow Balance"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 #, fuzzy
 msgid "Adjust the yellow gray balance"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 #, fuzzy
 msgid "Saturation"
 msgstr "Mättnad:"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -928,184 +971,184 @@ msgstr ""
 "Använd noll som mättnad för att skapa gråskaleutdata med färgbläck och svart "
 "bläck"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 #, fuzzy
 msgid "Ink Limit"
 msgstr "Bläcktyp"
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 #, fuzzy
 msgid "Advanced Output Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 #, fuzzy
 msgid " Curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "Output Curves"
 msgstr "Utdatatyp:"
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr ""
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 #, fuzzy
 msgid "Cyan curve"
 msgstr "Avbryt"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 #, fuzzy
 msgid "Magenta Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 #, fuzzy
 msgid "Magenta curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 #, fuzzy
 msgid "Yellow Curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 #, fuzzy
 msgid "Yellow curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 #, fuzzy
 msgid "Black Curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 #, fuzzy
 msgid "Black curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 #, fuzzy
 msgid "Red Curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 #, fuzzy
 msgid "Red curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 #, fuzzy
 msgid "Green Curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 #, fuzzy
 msgid "Green curve"
 msgstr "Magenta"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 #, fuzzy
 msgid "Blue Curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 #, fuzzy
 msgid "Blue curve"
 msgstr "Svart"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 #, fuzzy
 msgid "White Curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 #, fuzzy
 msgid "White curve"
 msgstr "Gult"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 #, fuzzy
 msgid "Saturation Map"
 msgstr "Mättnad:"
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1196,134 +1239,140 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "Standard"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr "Rullmatning"
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 #, fuzzy
 msgid "Manual Feed"
 msgstr "Manuell"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 #, fuzzy
 msgid "Print to CD"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 #, fuzzy
 msgid "Cut Sheet Autoselect"
 msgstr "Välj automatiskt"
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 #, fuzzy
 msgid "High"
 msgstr "Höjd:"
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 #, fuzzy
 msgid "Photo"
 msgstr "Fotografi"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 #, fuzzy
 msgid "Super Photo"
 msgstr "Stylus Photo"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 #, fuzzy
 msgid "Ultra Photo"
 msgstr "Sexfärgs foto"
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 #, fuzzy
 msgid "Light Cyan"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 #, fuzzy
 msgid "Light Magenta"
 msgstr "Ljus magenta"
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 #, fuzzy
 msgid "Light Black"
 msgstr "Svart"
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 #, fuzzy
 msgid "Dark Yellow"
 msgstr "Gult"
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 #, fuzzy
 msgid "Matte Black"
 msgstr "Matte-papper"
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 #, fuzzy
 msgid "Photo Black"
 msgstr "Fotopapper"
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 #, fuzzy
 msgid "Gloss Optimizer"
 msgstr "Glansig film"
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+#, fuzzy
+msgid "Light Light Black"
+msgstr "Svart"
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1393,11 +1442,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1546,106 +1595,107 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
 #, fuzzy
-msgid "Dark Gray Transition"
+msgid "Light Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 #, fuzzy
-msgid "Mid Gray Transition"
+msgid "Dark Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:516
 #, fuzzy
-msgid "Medium Gray Transition"
+msgid "Mid Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
+#: src/main/print-escp2.c:517
 #, fuzzy
-msgid "Light Gray Transition"
+msgid "Medium Gray Transition"
 msgstr "Ljus cyan"
 
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 #, fuzzy
 msgid "Full Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr ""
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 #, fuzzy
 msgid "Print To Hub"
 msgstr "Skriv ut till fil?"
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 #, fuzzy
 msgid "Manual Control"
 msgstr "Utdatatyp:"
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 #, fuzzy
 msgid "Automatic"
 msgstr "Storlek"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 #, fuzzy
 msgid "Bidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 #, fuzzy
 msgid "Unidirectional"
 msgstr "600 DPI enkelriktad"
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, fuzzy, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr "Skrivaren stöder inte färgutskrift\n"
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1700,147 +1750,158 @@ msgstr "testutskrift"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr "Sexfärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr "Femfärgsfoto sammansatt"
 
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "Glansig film"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "Kuvert"
 
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "Bläckstrålepapper"
 
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "Bläckstrålepapper med fotokvalitet"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "Fotopapper"
 
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "Fotopapper med premiumlyster"
 
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "Glansigt papper med fotokvalitet"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr "Tungt Ilford-papper"
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 #, fuzzy
 msgid "Glossy"
 msgstr "Glansig film"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 #, fuzzy
 msgid "Matte"
 msgstr "Matte-papper"
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 #, fuzzy
 msgid "Adjust the cyan balance"
 msgstr "Justera cyanbalansen på utskriften"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 #, fuzzy
 msgid "Adjust the magenta balance"
 msgstr "Justera magentabalansen på utskriften"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 #, fuzzy
 msgid "Adjust the yellow balance"
 msgstr "Justera gulbalansen på utskriften"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 #, fuzzy
 msgid "Black Balance"
 msgstr "Svartvitt"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 #, fuzzy
 msgid "Adjust the black balance"
 msgstr "Justera cyanbalansen på utskriften"
@@ -1921,14 +1982,6 @@ msgstr "600×600 DPI enfärgad"
 msgid "2400x600 DPI"
 msgstr "2400×600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr ""
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr "Färgpatroner + svarta patroner"
@@ -1937,27 +1990,17 @@ msgstr "Färgpatroner + svarta patroner"
 msgid "Color + Photo Cartridges"
 msgstr "Färgpatroner + fotopatroner"
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD-fil:"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 #, fuzzy
 msgid "PPD File"
 msgstr "PPD-fil?"
@@ -1966,179 +2009,199 @@ msgstr "PPD-fil?"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr "Tvånivås gråton"
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+#, fuzzy
+msgid "Three Level Grayscale"
+msgstr "Tvånivås gråton"
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr "Quadtone"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr "Sexfärgs förbättrad sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr "Sjufärgs förbättrad"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+#, fuzzy
+msgid "Eight Color Photo"
+msgstr "Sexfärgs foto"
+
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 #, fuzzy
 msgid "One Color Raw"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 #, fuzzy
 msgid "One Color Raw Enhanced Gloss"
 msgstr "Sjufärgs förbättrad"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 #, fuzzy
 msgid "Two Color Raw"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 #, fuzzy
 msgid "Three Color Raw"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 #, fuzzy
 msgid "Three Color Raw Gloss"
 msgstr "Trefärgers sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 #, fuzzy
 msgid "Four Color Raw"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 #, fuzzy
 msgid "Four Color Raw Gloss"
 msgstr "Fyrfärgs standard"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 #, fuzzy
 msgid "Five Color Raw"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 #, fuzzy
 msgid "Six Color Raw"
 msgstr "Sexfärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 #, fuzzy
 msgid "Six Color Enhanced Gloss Raw"
 msgstr "Sexfärgs förbättrad sammansatt"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 #, fuzzy
 msgid "Seven Color Raw"
 msgstr "Sjufärgs foto"
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 #, fuzzy
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr "Sjufärgs förbättrad"
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+# Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
+#: src/main/escp2-channels.c:1896
+#, fuzzy
+msgid "Eight Color Raw"
+msgstr "Sexfärgs foto"
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
 # Jag tror inte detta ska skrivas samman, jfr snarlika meddelanden
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 #, fuzzy
 msgid "UltraChrome Photo Black"
 msgstr "Sexfärgs foto"
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr "Snabbladdning av vanligt papper"
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "Vykort"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr "Bakljusfilm"
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 #, fuzzy
 msgid "Matte Paper Heavyweight"
 msgstr "Matte-papper"
 
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 #, fuzzy
 msgid "Premium Semigloss Photo Paper"
 msgstr "Premiumglansigt fotopapper"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 #, fuzzy
 msgid "ColorLife Paper"
 msgstr "ColorLife-papper"
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 #, fuzzy
 msgid "Archival Matte Paper"
 msgstr "Matte-papper"
 
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr ""
 
@@ -2206,68 +2269,78 @@ msgstr "1440 × 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 × 360 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 × 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 #, fuzzy
 msgid "2880 x 720 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 #, fuzzy
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "1440 × 360 DPI högsta kvalitet"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 #, fuzzy
 msgid "1440 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 #, fuzzy
 msgid "2880 x 1440 DPI"
 msgstr "1440 × 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "1440 × 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 #, fuzzy
 msgid "2880 x 2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 × 720 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 #, fuzzy
 msgid "Interleave"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 #, fuzzy
 msgid "Interleave 2"
 msgstr "Skrivarnamn:"
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 #, fuzzy
 msgid "Eight Pass"
 msgstr "Ljusstyrka:"
@@ -2970,1313 +3043,1466 @@ msgid "Canon BJC 8200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+msgid "Canon S200"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:164
-msgid "Canon S450"
+msgid "Canon S400"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:165
-msgid "Canon S800"
+msgid "Canon S450"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:166
-msgid "Canon S4500"
+msgid "Canon S800"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:167
-msgid "Canon PIXMA iP4000"
+msgid "Canon S4500"
 msgstr ""
 
 #: src/main/xmli18n-tmp.h:168
+msgid "Canon PIXMA iP4000"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "Stylus C20ux"
+
+#: src/main/xmli18n-tmp.h:170
 #, fuzzy
 msgid "EPSON Stylus C20SX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 #, fuzzy
 msgid "EPSON Stylus C20UX"
 msgstr "Stylus C20ux"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "Stylus C40ux"
+
+#: src/main/xmli18n-tmp.h:173
 #, fuzzy
 msgid "EPSON Stylus C40SX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 #, fuzzy
 msgid "EPSON Stylus C40UX"
 msgstr "Stylus C40ux"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "Stylus C41ux"
+
+#: src/main/xmli18n-tmp.h:176
 #, fuzzy
 msgid "EPSON Stylus C41SX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 #, fuzzy
 msgid "EPSON Stylus C41UX"
 msgstr "Stylus C41ux"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:179
 #, fuzzy
 msgid "EPSON Stylus C42SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 #, fuzzy
 msgid "EPSON Stylus C42UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:182
 #, fuzzy
 msgid "EPSON Stylus C43SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 #, fuzzy
 msgid "EPSON Stylus C43UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "Stylus C42ux"
+
+#: src/main/xmli18n-tmp.h:185
 #, fuzzy
 msgid "EPSON Stylus C44SX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 #, fuzzy
 msgid "EPSON Stylus C44UX"
 msgstr "Stylus C42ux"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 #, fuzzy
 msgid "EPSON Stylus C45"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 #, fuzzy
 msgid "EPSON Stylus C46"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:190
 #, fuzzy
 msgid "EPSON Stylus C50"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 #, fuzzy
 msgid "EPSON Stylus C60"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 #, fuzzy
 msgid "EPSON Stylus C61"
 msgstr "Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 #, fuzzy
 msgid "EPSON Stylus C62"
 msgstr "Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 #, fuzzy
 msgid "EPSON Stylus C63"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 #, fuzzy
 msgid "EPSON Stylus C64"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 #, fuzzy
 msgid "EPSON Stylus C65"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 #, fuzzy
 msgid "EPSON Stylus C66"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:199
 #, fuzzy
 msgid "EPSON Stylus C70"
 msgstr "Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 #, fuzzy
 msgid "EPSON Stylus C80"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 #, fuzzy
 msgid "EPSON Stylus C82"
 msgstr "Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 #, fuzzy
 msgid "EPSON Stylus C83"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 #, fuzzy
 msgid "EPSON Stylus C84"
 msgstr "Stylus C80"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 #, fuzzy
 msgid "EPSON Stylus C85"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 #, fuzzy
 msgid "EPSON Stylus C86"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 #, fuzzy
 msgid "EPSON Stylus Color"
 msgstr "Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 #, fuzzy
 msgid "EPSON Stylus Color Pro"
 msgstr "Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 #, fuzzy
 msgid "EPSON Stylus Color Pro XL"
 msgstr "Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 #, fuzzy
 msgid "EPSON Stylus Color 400"
 msgstr "Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 #, fuzzy
 msgid "EPSON Stylus Color 440"
 msgstr "Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 #, fuzzy
 msgid "EPSON Stylus Color 460"
 msgstr "Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 #, fuzzy
 msgid "EPSON Stylus Color 480"
 msgstr "Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 #, fuzzy
 msgid "EPSON Stylus Color 500"
 msgstr "Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 #, fuzzy
 msgid "EPSON Stylus Color 580"
 msgstr "Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 #, fuzzy
 msgid "EPSON Stylus Color 600"
 msgstr "Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 #, fuzzy
 msgid "EPSON Stylus Color 640"
 msgstr "Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 #, fuzzy
 msgid "EPSON Stylus Color 660"
 msgstr "Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 #, fuzzy
 msgid "EPSON Stylus Color 670"
 msgstr "Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 #, fuzzy
 msgid "EPSON Stylus Color 680"
 msgstr "Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 #, fuzzy
 msgid "EPSON Stylus Color 740"
 msgstr "Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 #, fuzzy
 msgid "EPSON Stylus Color 760"
 msgstr "Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 #, fuzzy
 msgid "EPSON Stylus Color 777"
 msgstr "Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 #, fuzzy
 msgid "EPSON Stylus Color 800"
 msgstr "Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 #, fuzzy
 msgid "EPSON Stylus Color 850"
 msgstr "Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 #, fuzzy
 msgid "EPSON Stylus Color 860"
 msgstr "Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 #, fuzzy
 msgid "EPSON Stylus Color 880"
 msgstr "Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 #, fuzzy
 msgid "EPSON Stylus Color 83"
 msgstr "Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 #, fuzzy
 msgid "EPSON Stylus Color 900"
 msgstr "Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 #, fuzzy
 msgid "EPSON Stylus Color 980"
 msgstr "Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 #, fuzzy
 msgid "EPSON Stylus Color 1160"
 msgstr "Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 #, fuzzy
 msgid "EPSON Stylus Color 1500"
 msgstr "Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 #, fuzzy
 msgid "EPSON Stylus Color 1520"
 msgstr "Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 #, fuzzy
 msgid "EPSON Stylus Color 3000"
 msgstr "Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 #, fuzzy
 msgid "EPSON Stylus Photo"
 msgstr "Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 #, fuzzy
 msgid "EPSON Stylus Photo 700"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 #, fuzzy
 msgid "EPSON Stylus Photo EX"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 #, fuzzy
 msgid "EPSON Stylus Photo EX3"
 msgstr "Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 #, fuzzy
 msgid "EPSON Stylus Photo 720"
 msgstr "Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 #, fuzzy
 msgid "EPSON Stylus Photo 750"
 msgstr "Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 #, fuzzy
 msgid "EPSON Stylus Photo 780"
 msgstr "Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 #, fuzzy
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 #, fuzzy
 msgid "EPSON Stylus Photo 790"
 msgstr "Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 #, fuzzy
 msgid "EPSON Stylus Photo 810"
 msgstr "Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 #, fuzzy
 msgid "EPSON Stylus Photo 820"
 msgstr "Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 #, fuzzy
 msgid "EPSON Stylus Photo 825"
 msgstr "Stylus Photo 785"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 #, fuzzy
 msgid "EPSON Stylus Photo 830"
 msgstr "Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 #, fuzzy
 msgid "EPSON Stylus Photo 870"
 msgstr "Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 #, fuzzy
 msgid "EPSON Stylus Photo 875"
 msgstr "Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 #, fuzzy
 msgid "EPSON Stylus Photo 890"
 msgstr "Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 #, fuzzy
 msgid "EPSON Stylus Photo 895"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 #, fuzzy
 msgid "EPSON Stylus Photo 900"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 #, fuzzy
 msgid "EPSON Stylus Photo 915"
 msgstr "Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 #, fuzzy
 msgid "EPSON Stylus Photo 925"
 msgstr "Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 #, fuzzy
 msgid "EPSON Stylus Photo 935"
 msgstr "Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 #, fuzzy
 msgid "EPSON Stylus Photo 950"
 msgstr "Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 #, fuzzy
 msgid "EPSON Stylus Photo 960"
 msgstr "Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 #, fuzzy
 msgid "EPSON Stylus Photo 1200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 #, fuzzy
 msgid "EPSON Stylus Photo 1270"
 msgstr "Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 #, fuzzy
 msgid "EPSON Stylus Photo 1280"
 msgstr "Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 #, fuzzy
 msgid "EPSON Stylus Photo 1290"
 msgstr "Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 #, fuzzy
 msgid "EPSON Stylus Photo 2000P"
 msgstr "Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 #, fuzzy
 msgid "EPSON Stylus Photo 2100"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 #, fuzzy
 msgid "EPSON Stylus Photo 2200"
 msgstr "Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 #, fuzzy
 msgid "EPSON Stylus Photo R200"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 #, fuzzy
 msgid "EPSON Stylus Photo R210"
 msgstr "Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 #, fuzzy
 msgid "EPSON Stylus Photo R300"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 #, fuzzy
 msgid "EPSON Stylus Photo R310"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:272
 #, fuzzy
 msgid "EPSON Stylus Photo RX400"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 #, fuzzy
 msgid "EPSON Stylus Photo RX420"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 #, fuzzy
 msgid "EPSON Stylus Photo RX425"
 msgstr "Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 #, fuzzy
 msgid "EPSON Stylus Photo RX430"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 #, fuzzy
 msgid "EPSON Stylus Photo RX500"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 #, fuzzy
 msgid "EPSON Stylus Photo RX510"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 #, fuzzy
 msgid "EPSON Stylus Photo RX600"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 #, fuzzy
 msgid "EPSON Stylus Photo RX620"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 #, fuzzy
 msgid "EPSON Stylus Photo RX630"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "Stylus Photo 700"
+
+#: src/main/xmli18n-tmp.h:282
 #, fuzzy
 msgid "EPSON Stylus Photo R800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 #, fuzzy
 msgid "EPSON Stylus Photo R1800"
 msgstr "Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "Stylus Photo 1200"
+
+#: src/main/xmli18n-tmp.h:285
 #, fuzzy
 msgid "EPSON Stylus Pro 5000"
 msgstr "Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 #, fuzzy
 msgid "EPSON Stylus Pro 5500"
 msgstr "Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 #, fuzzy
 msgid "EPSON Stylus Pro 7000"
 msgstr "Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 #, fuzzy
 msgid "EPSON Stylus Pro 7500"
 msgstr "Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 #, fuzzy
 msgid "EPSON Stylus Pro 7600"
 msgstr "Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 #, fuzzy
 msgid "EPSON Stylus Pro 9000"
 msgstr "Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 #, fuzzy
 msgid "EPSON Stylus Pro 9500"
 msgstr "Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 #, fuzzy
 msgid "EPSON Stylus Pro 9600"
 msgstr "Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 #, fuzzy
 msgid "EPSON Stylus Pro 10000"
 msgstr "Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 #, fuzzy
 msgid "EPSON Stylus Scan 2000"
 msgstr "Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 #, fuzzy
 msgid "EPSON Stylus Scan 2500"
 msgstr "Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 #, fuzzy
 msgid "EPSON Stylus CX1500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 #, fuzzy
 msgid "EPSON Stylus CX3100"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 #, fuzzy
 msgid "EPSON Stylus CX3200"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 #, fuzzy
 msgid "EPSON Stylus CX3500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 #, fuzzy
 msgid "EPSON Stylus CX3600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 #, fuzzy
 msgid "EPSON Stylus CX3650"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:306
 #, fuzzy
 msgid "EPSON Stylus CX4600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:309
 #, fuzzy
 msgid "EPSON Stylus CX5100"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 #, fuzzy
 msgid "EPSON Stylus CX5200"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 #, fuzzy
 msgid "EPSON Stylus CX5300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 #, fuzzy
 msgid "EPSON Stylus CX5400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:314
 #, fuzzy
 msgid "EPSON Stylus CX6300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 #, fuzzy
 msgid "EPSON Stylus CX6400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 #, fuzzy
 msgid "EPSON Stylus CX6500"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 #, fuzzy
 msgid "EPSON Stylus CX6600"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:320
 #, fuzzy
 msgid "EPSON Stylus CX8300"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 #, fuzzy
 msgid "EPSON Stylus CX8400"
 msgstr "Stylus C20sx"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "Stylus C60"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "Stylus C20sx"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 #, fuzzy
 msgid "EPSON PM-D750"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 #, fuzzy
 msgid "EPSON PM-D770"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 #, fuzzy
 msgid "EPSON PM-D1000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 #, fuzzy
 msgid "EPSON PM-G700"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 #, fuzzy
 msgid "EPSON PM-G720"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 #, fuzzy
 msgid "EPSON PM-G800"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 #, fuzzy
 msgid "EPSON PM-G820"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 #, fuzzy
 msgid "EPSON PX-G900"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 #, fuzzy
 msgid "EPSON PX-G920"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 #, fuzzy
 msgid "EPSON PX-G5000"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 #, fuzzy
 msgid "EPSON PX-V500"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 #, fuzzy
 msgid "EPSON PX-V600"
 msgstr "Stylus C60"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+msgid "Sony UP-DR150"
+msgstr ""
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "tum"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "Ställ in grundenheten till tum"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "cm"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "Ställ in grundenheten till centimeter"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Points"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 #, fuzzy
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr "Ställ in grundenheten till tum"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 #, fuzzy
 msgid "Set the base unit of measurement to millimetres"
 msgstr "Ställ in grundenheten till centimeter"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr ""
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 #, fuzzy
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "Ställ in grundenheten till tum"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "Färgutdata"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "Skriv ut i gråtoner genom att använda svart bläck"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 #, fuzzy
 msgid "Standard Command"
 msgstr "Standard"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 #, fuzzy
 msgid "Custom Command"
 msgstr "Kommando:"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr ""
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "Fil"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 #, fuzzy
 msgid "Print to a file"
 msgstr "Skriv ut till fil?"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 #, fuzzy
 msgid "Set Default"
 msgstr "Ställ in standardvärden"
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "OK"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- Utskrift v%s"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "Om"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -4284,7 +4510,7 @@ msgstr ""
 "Skriv ut och\n"
 "spara inställningar"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -4292,15 +4518,15 @@ msgstr ""
 "Spara\n"
 "inställningar"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "Förhandsgranskning"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -4324,200 +4550,200 @@ msgstr ""
 "Om du klickar någon annan knapp under tiden du drar med musen kommer bilden "
 "att återgå till sin ursprungliga position."
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 #, fuzzy
 msgid "Paper Size"
 msgstr "Storlek"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "Dimensioner:"
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "Bredd:"
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "Bredd på pappret som du vill skriva ut till"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "Höjd:"
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "Höjd på pappret som du vill skriva ut till"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 #, fuzzy
 msgid "Automatic Paper Size"
 msgstr "Storlek"
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 #, fuzzy
 msgid "Image Position"
 msgstr "Position"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "Automatik"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "Stående"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "Liggande"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "Uppochner"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "Liggande uppochner"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr ""
 "Välj orientering: stående, liggande, uppochner eller liggande uppochner"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "Vänster:"
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "Avstånd från vänsterkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "Höger:"
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "Avstånd från vänsterkanten på pappret till högerkanten på bilden"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "Avstånd från högerkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "Övre kant:"
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "Avstånd från överkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "Nedre kant:"
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 #, fuzzy
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "Avstånd från överkanten på pappret till nederkanten på bilden"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "Avstånd från nederkanten på pappret till bilden"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "Centrera:"
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 #, fuzzy
 msgid "Horizontal"
 msgstr "Horisontellt"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "Centrera bilden horisontellt på pappret"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "Både och"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "Centrera bilden på pappret"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 #, fuzzy
 msgid "Vertical"
 msgstr "Vertikalt"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "Centrera bilden vertikalt på pappret"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "Konfigurera skrivare"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 #, fuzzy
 msgid "Printer Make:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 #, fuzzy
 msgid "Select the make of your printer"
 msgstr "Välj din skrivarmodell"
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "Skrivarmodell:"
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "Välj din skrivarmodell"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD-fil:"
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "Ange rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "Välj rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 #, fuzzy
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
@@ -4526,54 +4752,54 @@ msgstr ""
 "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
 "skriva ut till"
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 #, fuzzy
 msgid "Printer Queue:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 #, fuzzy
 msgid "Enter the correct command to print to your printer. "
 msgstr "Ange rätt PPD-filnamn för din skrivare"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr ""
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 #, fuzzy
 msgid "File to print to"
 msgstr "testutskrift"
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 #, fuzzy
 msgid "Print To File"
 msgstr "Skriv ut till fil?"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "Ange ny skrivare"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "Skrivarnamn:"
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "Ange det namn som du vill ge denna logiska skrivare"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 #, fuzzy
 msgid "About Gutenprint "
 msgstr "Om Gimp-Print "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid "Gutenprint Version "
 msgstr "Gimp-Print version "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4636,11 +4862,11 @@ msgstr ""
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "Skrivarinställningar"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
@@ -4648,11 +4874,11 @@ msgstr ""
 "Välj namnet på skrivaren (inte skrivarens typ eller modell) som du vill "
 "skriva ut till"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "Konfigurera skrivare..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
@@ -4660,11 +4886,11 @@ msgstr ""
 "Välj den skrivarmodell, PPD-fil och kommando som används för att skriva ut "
 "till denna skrivare"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "Ny skrivare..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
@@ -4672,24 +4898,24 @@ msgstr ""
 "Ange en ny logisk skrivare. Detta kan användas för att namnge en samling "
 "inställningar som du vill komma ihåg för framtida användning."
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 #, fuzzy
 msgid "Image Size"
 msgstr "Storlek"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "Skalning:"
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "Ändra skalningen (storleken) på bilden"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
@@ -4697,31 +4923,31 @@ msgstr ""
 "Välj huruvida skalning mäts i procent av tillgänglig sidstorlek eller antal "
 "utdatapunkter per tum"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "Procent"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "Skala utskriften till storleken på sidan"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "Skala utskriften till antalet punkter per tum"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "Ställ in bredden på utskriften"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4729,68 +4955,68 @@ msgstr ""
 "Använd\n"
 "originalbildstorlek"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "Ställ in storleken på utskriften till storleken på sidan"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "Justera utskriftsfärg"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr "Ställ in standardvärden"
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "Stäng"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "Förhandsgranskning av bild"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 #, fuzzy
 msgid "Output"
 msgstr "Utdatatyp:"
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr "Utdatatyp:"
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "Välj önskad typ av utdata"
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "Justera utdata..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr ""
 "Justera färgbalans, ljusstyrka, kontrast, mättnad och färgutjämningsalgoritm"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 #, fuzzy
 msgid "Size Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 #, fuzzy
 msgid " "
 msgstr "> "
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "Enheter:"
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "Välj grundenheten för utskrift"
 
@@ -4823,12 +5049,12 @@ msgstr ""
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr ""
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 #, fuzzy
 msgid "Printer"
 msgstr "Skriv ut"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 #, fuzzy
 msgid "(Default Printer)"
 msgstr "Konfigurera skrivare"
@@ -4878,70 +5104,70 @@ msgstr ""
 msgid "_Gamma value"
 msgstr ""
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 #, fuzzy
 msgid "Printer Features"
 msgstr "Skrivarinställningar"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 #, fuzzy
 msgid "Output Control"
 msgstr "Utdatatyp:"
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 #, fuzzy
 msgid "Common"
 msgstr "Kommando:"
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 #, fuzzy
 msgid "Extra 1"
 msgstr "Fack 1"
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 #, fuzzy
 msgid "Extra 2"
 msgstr "Fack 2"
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 #, fuzzy
 msgid "Extra 3"
 msgstr "Fack 3"
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 #, fuzzy
 msgid "Extra 4"
 msgstr "Fack 4"
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 #, fuzzy
 msgid "Gutenprint"
 msgstr "testutskrift"
 
 # gzprintf(fp, "*LanguageVersion: %s\n", _("English"));
 #
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr "Swedish"
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr "ISOLatin1"
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr ""
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr ""
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -5231,18 +5457,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "Kan inte läsa från %s: %s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr "Kan inte öppna %s för läsning och skrivning: %s\n"
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -5251,7 +5477,7 @@ msgstr ""
 "\n"
 "Kan inte skriva till %s: %s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -5269,83 +5495,84 @@ msgstr ""
 "Kan inte detektera skrivartyp.\n"
 "Använd flaggan -m för att ange din skrivarmodell.\n"
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
 msgstr ""
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr ""
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, fuzzy, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, fuzzy, c-format
 msgid "Cannot identify printer!\n"
 msgstr "Kan inte tolka utdata från skrivare\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, fuzzy, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr "Skrivaren stöder inte färgutskrift\n"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "Bläckfärg"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr "Återstående procent"
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr ""
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, fuzzy, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr "Att få tag i bläcknivåerna kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr ""
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr "Skrivaridentifiering kräver att en rå enhet används.\n"
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, fuzzy, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "Du kan endast ange en skrivarmodell."
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr "Rensar huvuden...\n"
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 "Kör kontroll av munstycken, försäkra dig om att det finns papper i\n"
 "skrivaren.\n"
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5419,7 +5646,7 @@ msgstr ""
 "Det är viktigt att du inte stänger av din skrivare under denna process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -5487,12 +5714,12 @@ msgstr ""
 "process.\n"
 "\n"
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr "Kan inte skicka kommando till skrivaren, avslutar.\n"
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -5511,20 +5738,20 @@ msgstr ""
 "Du kommer att få bekräfta ditt val.\n"
 "Vad vill du göra (s, q, r)?\n"
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 "Bekräfta att du vill avsluta utan att spara genom att trycka \"q\" igen:\n"
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
@@ -5533,7 +5760,7 @@ msgstr ""
 "OK, din skrivare är justerad, men justeringen har inte sparats.\n"
 "Om du vill spara justeringen måste du upprepa detta förlopp.\n"
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
@@ -5542,12 +5769,12 @@ msgstr ""
 "Bekräfta att du vill upprepa justeringsprocessen genom att\n"
 "ange \"r\" igen:\n"
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr "Upprepar justeringsprocessen.\n"
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -5562,17 +5789,17 @@ msgstr ""
 "Bekräfta att du vill spara ändringarna i skrivaren genom att ange\n"
 "\"s\" igen:\n"
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "Kommer att spara inställningar..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "misslyckades!\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
@@ -5581,27 +5808,27 @@ msgstr ""
 "Dina inställningar sparades inte utan problem. Du måste upprepa\n"
 "justeringsproceduren.\n"
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "lyckades!\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr "Dina justeringsinställningar har sparats till skrivaren.\n"
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr "Okänt kommando.\n"
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr "Sista kommandot bekräftades inte.\n"
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -5618,12 +5845,12 @@ msgstr ""
 "Placera ett pappersark i skrivaren för att påbörja justeringen\n"
 "av huvudena.\n"
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "Tryck retur för att fortsätta > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -5634,42 +5861,42 @@ msgstr ""
 "Skriv in ett parnummer, \"?\" för hjälp, eller \"r\" för att upprepa "
 "proceduren.\n"
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "Pass %d"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "Mata in ett nytt pappersark.\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "Numret är utanför intervallet!\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr "Jag kan inte förstå vad du skrev!\n"
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr "Det bästa linjeparet bör vara numrerat mellan 1 och %d.\n"
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr "Försöker ställa in justering..."
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "lyckades.\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5682,7 +5909,7 @@ msgstr ""
 "linje är mönster %d. Om det inte är det bör du upprepa proceduren för\n"
 "att få bästa utskriftskvalitet.\n"
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr "Fel i indata\n"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index e399b75..8f77f5c 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1f068c3..6833c5d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gutenprint 5.0.0-b5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-27 11:57-0400\n"
+"POT-Creation-Date: 2005-11-22 14:52+0000\n"
 "PO-Revision-Date: 2005-08-07 12:56+0800\n"
 "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -70,16 +70,16 @@ msgstr ""
 msgid "Density"
 msgstr "密度"
 
-#: src/main/dither-main.c:89 src/main/print-canon.c:1472
-#: src/main/print-canon.c:1480 src/main/print-canon.c:1488
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:412
+#: src/main/dither-main.c:89 src/main/print-canon.c:1519
+#: src/main/print-canon.c:1527 src/main/print-canon.c:1535
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:412
 #: src/main/print-escp2.c:420 src/main/print-escp2.c:428
 #: src/main/print-escp2.c:436 src/main/print-escp2.c:444
 #: src/main/print-escp2.c:452 src/main/print-escp2.c:460
 #: src/main/print-lexmark.c:325 src/main/print-lexmark.c:333
 #: src/main/print-lexmark.c:341 src/main/print-lexmark.c:349
-#: src/main/print-olympus.c:1221 src/main/print-olympus.c:1229
-#: src/main/print-olympus.c:1237 src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1330 src/main/print-olympus.c:1338
+#: src/main/print-olympus.c:1346 src/main/print-olympus.c:1354
 #: src/main/print-pcl.c:1218 src/main/print-pcl.c:1226
 #: src/main/print-pcl.c:1234 src/main/print-pcl.c:1242
 msgid "Output Level Adjustment"
@@ -136,289 +136,289 @@ msgstr ""
 msgid "Dither algorithm"
 msgstr "擬色�算方�"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI"
 msgstr "90x90 DPI"
 
-#: src/main/print-canon.c:1330
+#: src/main/print-canon.c:1367
 msgid "90x90 DPI DMT"
 msgstr "90x90 DPI DMT"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI"
 msgstr "180x180 DPI"
 
-#: src/main/print-canon.c:1331
+#: src/main/print-canon.c:1368
 msgid "180x180 DPI DMT"
 msgstr "180x180 DPI DMT"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI"
 msgstr "360x360 DPI"
 
-#: src/main/print-canon.c:1332
+#: src/main/print-canon.c:1369
 msgid "360x360 DPI DMT"
 msgstr "360x360 DPI DMT"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI"
 msgstr "720x360 DPI"
 
-#: src/main/print-canon.c:1333
+#: src/main/print-canon.c:1370
 msgid "720x360 DPI DMT"
 msgstr "720x360 DPI DMT"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI"
 msgstr "720x720 DPI"
 
-#: src/main/print-canon.c:1334
+#: src/main/print-canon.c:1371
 msgid "720x720 DPI DMT"
 msgstr "720x720 DPI DMT"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI"
 msgstr "1440x720 DPI"
 
-#: src/main/print-canon.c:1335
+#: src/main/print-canon.c:1372
 msgid "1440x720 DPI DMT"
 msgstr "1440x720 DPI DMT"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI"
 msgstr "1440x1440 DPI"
 
-#: src/main/print-canon.c:1336
+#: src/main/print-canon.c:1373
 msgid "1440x1440 DPI DMT"
 msgstr "1440x1440 DPI DMT"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI"
 msgstr "2880x2880 DPI"
 
-#: src/main/print-canon.c:1337
+#: src/main/print-canon.c:1374
 msgid "2880x2880 DPI DMT"
 msgstr "2880x2880 DPI DMT"
 
-#: src/main/print-canon.c:1338 src/main/print-pcl.c:253
+#: src/main/print-canon.c:1375 src/main/print-pcl.c:253
 msgid "150x150 DPI"
 msgstr "150x150 DPI"
 
-#: src/main/print-canon.c:1338
+#: src/main/print-canon.c:1375
 msgid "150x150 DPI DMT"
 msgstr "150x150 DPI DMT"
 
-#: src/main/print-canon.c:1339 src/main/print-pcl.c:254
+#: src/main/print-canon.c:1376 src/main/print-pcl.c:254
 msgid "300x300 DPI"
 msgstr "300x300 DPI"
 
-#: src/main/print-canon.c:1339
+#: src/main/print-canon.c:1376
 msgid "300x300 DPI DMT"
 msgstr "300x300 DPI DMT"
 
-#: src/main/print-canon.c:1340 src/main/print-pcl.c:255
+#: src/main/print-canon.c:1377 src/main/print-pcl.c:255
 msgid "600x300 DPI"
 msgstr "600x300 DPI"
 
-#: src/main/print-canon.c:1340
+#: src/main/print-canon.c:1377
 msgid "600x300 DPI DMT"
 msgstr "600x300 DPI DMT"
 
-#: src/main/print-canon.c:1341 src/main/print-pcl.c:257
+#: src/main/print-canon.c:1378 src/main/print-pcl.c:257
 msgid "600x600 DPI"
 msgstr "600x600 DPI"
 
-#: src/main/print-canon.c:1341
+#: src/main/print-canon.c:1378
 msgid "600x600 DPI DMT"
 msgstr "600x600 DPI DMT"
 
-#: src/main/print-canon.c:1342 src/main/print-pcl.c:258
+#: src/main/print-canon.c:1379 src/main/print-pcl.c:258
 msgid "1200x600 DPI"
 msgstr "1200x600 DPI"
 
-#: src/main/print-canon.c:1342
+#: src/main/print-canon.c:1379
 msgid "1200x600 DPI DMT"
 msgstr "1200x600 DPI DMT"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI"
 msgstr "1200x1200 DPI"
 
-#: src/main/print-canon.c:1343
+#: src/main/print-canon.c:1380
 msgid "1200x1200 DPI DMT"
 msgstr "1200x1200 DPI DMT"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI"
 msgstr "2400x2400 DPI"
 
-#: src/main/print-canon.c:1344
+#: src/main/print-canon.c:1381
 msgid "2400x2400 DPI DMT"
 msgstr "2400x2400 DPI DMT"
 
-#: src/main/print-canon.c:1393 src/main/print-lexmark.c:857
-#: src/main/escp2-papers.c:965 src/main/escp2-papers.c:1009
-#: src/main/escp2-papers.c:1053 src/main/escp2-papers.c:1101
-#: src/main/escp2-papers.c:1145
+#: src/main/print-canon.c:1432 src/main/print-lexmark.c:857
+#: src/main/escp2-papers.c:1150 src/main/escp2-papers.c:1194
+#: src/main/escp2-papers.c:1238 src/main/escp2-papers.c:1286
+#: src/main/escp2-papers.c:1334 src/main/escp2-papers.c:1378
 msgid "Plain Paper"
 msgstr "普通紙張"
 
-#: src/main/print-canon.c:1394
+#: src/main/print-canon.c:1433
 #, fuzzy
 msgid "Plain Paper PIXMA"
 msgstr "普通紙張"
 
-#: src/main/print-canon.c:1395 src/main/print-lexmark.c:865
-#: src/main/escp2-papers.c:973 src/main/escp2-papers.c:1017
-#: src/main/escp2-papers.c:1061 src/main/escp2-papers.c:1109
-#: src/main/escp2-papers.c:1153
+#: src/main/print-canon.c:1434 src/main/print-lexmark.c:865
+#: src/main/escp2-papers.c:1158 src/main/escp2-papers.c:1202
+#: src/main/escp2-papers.c:1246 src/main/escp2-papers.c:1294
+#: src/main/escp2-papers.c:1342 src/main/escp2-papers.c:1386
 msgid "Transparencies"
 msgstr "�明膠片"
 
-#: src/main/print-canon.c:1396
+#: src/main/print-canon.c:1435
 msgid "Back Print Film"
 msgstr ""
 
-#: src/main/print-canon.c:1397
+#: src/main/print-canon.c:1436
 msgid "Fabric Sheets"
 msgstr ""
 
-#: src/main/print-canon.c:1398
+#: src/main/print-canon.c:1437
 msgid "Envelope"
 msgstr "ä¿¡å°�"
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1399
+#: src/main/print-canon.c:1438
 msgid "High Resolution Paper"
 msgstr "高解�度彩色專用紙"
 
 # (Abel) from www.easyoffice.com.tw
-#: src/main/print-canon.c:1400
+#: src/main/print-canon.c:1439
 msgid "T-Shirt Transfers"
 msgstr "T�轉�紙"
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1401
+#: src/main/print-canon.c:1440
 msgid "High Gloss Film"
 msgstr "影�寫真光澤膠片"
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1402
+#: src/main/print-canon.c:1441
 msgid "Glossy Photo Paper"
 msgstr "影�寫真光澤紙"
 
-#: src/main/print-canon.c:1403
+#: src/main/print-canon.c:1442
 msgid "Glossy Photo Cards"
 msgstr ""
 
 # (Abel) from Canon
-#: src/main/print-canon.c:1404
+#: src/main/print-canon.c:1443
 msgid "Photo Paper Pro"
 msgstr "專業級相紙"
 
-#: src/main/print-canon.c:1405 src/main/print-lexmark.c:905
-#: src/main/escp2-papers.c:1001 src/main/escp2-papers.c:1045
-#: src/main/escp2-papers.c:1093 src/main/escp2-papers.c:1137
-#: src/main/escp2-papers.c:1185
+#: src/main/print-canon.c:1444 src/main/print-lexmark.c:905
+#: src/main/escp2-papers.c:1186 src/main/escp2-papers.c:1230
+#: src/main/escp2-papers.c:1278 src/main/escp2-papers.c:1326
+#: src/main/escp2-papers.c:1370 src/main/escp2-papers.c:1418
 msgid "Other"
 msgstr "其它"
 
-#: src/main/print-canon.c:1413 src/main/print-escp2.c:177
-#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1156
+#: src/main/print-canon.c:1454 src/main/print-escp2.c:177
+#: src/main/print-lexmark.c:266 src/main/print-olympus.c:1265
 #: src/main/print-pcl.c:1153 src/main/print-ps.c:66
 msgid "Page Size"
 msgstr "��尺寸"
 
-#: src/main/print-canon.c:1413 src/main/print-canon.c:1419
-#: src/main/print-canon.c:1425 src/main/print-canon.c:1431
-#: src/main/print-escp2.c:177 src/main/print-escp2.c:183
-#: src/main/print-escp2.c:189 src/main/print-escp2.c:195
-#: src/main/print-escp2.c:213 src/main/print-escp2.c:230
-#: src/main/print-escp2.c:236 src/main/print-escp2.c:248
-#: src/main/print-escp2.c:266 src/main/print-lexmark.c:266
-#: src/main/print-lexmark.c:272 src/main/print-lexmark.c:278
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1156
-#: src/main/print-olympus.c:1162 src/main/print-olympus.c:1168
-#: src/main/print-olympus.c:1174 src/main/print-pcl.c:1153
-#: src/main/print-pcl.c:1159 src/main/print-pcl.c:1165
-#: src/main/print-pcl.c:1171 src/main/print-pcl.c:1195 src/main/print-ps.c:66
-#: src/main/print-ps.c:72 src/main/print-ps.c:78 src/main/print-ps.c:84
-#: src/main/print-ps.c:96
+#: src/main/print-canon.c:1454 src/main/print-canon.c:1460
+#: src/main/print-canon.c:1466 src/main/print-canon.c:1472
+#: src/main/print-canon.c:1496 src/main/print-escp2.c:177
+#: src/main/print-escp2.c:183 src/main/print-escp2.c:189
+#: src/main/print-escp2.c:195 src/main/print-escp2.c:213
+#: src/main/print-escp2.c:230 src/main/print-escp2.c:236
+#: src/main/print-escp2.c:248 src/main/print-escp2.c:266
+#: src/main/print-lexmark.c:266 src/main/print-lexmark.c:272
+#: src/main/print-lexmark.c:278 src/main/print-lexmark.c:284
+#: src/main/print-olympus.c:1265 src/main/print-olympus.c:1271
+#: src/main/print-olympus.c:1277 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1153 src/main/print-pcl.c:1159
+#: src/main/print-pcl.c:1165 src/main/print-pcl.c:1171
+#: src/main/print-pcl.c:1195 src/main/print-ps.c:66 src/main/print-ps.c:72
+#: src/main/print-ps.c:78 src/main/print-ps.c:84 src/main/print-ps.c:96
 msgid "Basic Printer Setup"
 msgstr "基本�表機設定"
 
-#: src/main/print-canon.c:1414 src/main/print-escp2.c:178
-#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1157
+#: src/main/print-canon.c:1455 src/main/print-escp2.c:178
+#: src/main/print-lexmark.c:267 src/main/print-olympus.c:1266
 #: src/main/print-pcl.c:1154 src/main/print-ps.c:67
 msgid "Size of the paper being printed to"
 msgstr "列�時使用的紙張尺寸"
 
-#: src/main/print-canon.c:1419 src/main/print-escp2.c:183
-#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1162
-#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1181
+#: src/main/print-canon.c:1460 src/main/print-escp2.c:183
+#: src/main/print-lexmark.c:272 src/main/print-olympus.c:1271
+#: src/main/print-pcl.c:1159 src/main/print-ps.c:72 src/cups/genppd.c:1179
 msgid "Media Type"
 msgstr "紙張類別"
 
-#: src/main/print-canon.c:1420 src/main/print-escp2.c:184
-#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1163
+#: src/main/print-canon.c:1461 src/main/print-escp2.c:184
+#: src/main/print-lexmark.c:273 src/main/print-olympus.c:1272
 #: src/main/print-pcl.c:1160 src/main/print-ps.c:73
 msgid "Type of media (plain paper, photo paper, etc.)"
 msgstr "紙張的類別 (普通紙�相紙等等)"
 
-#: src/main/print-canon.c:1425 src/main/print-escp2.c:189
-#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1168
-#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1205
+#: src/main/print-canon.c:1466 src/main/print-escp2.c:189
+#: src/main/print-lexmark.c:278 src/main/print-olympus.c:1277
+#: src/main/print-pcl.c:1165 src/main/print-ps.c:78 src/cups/genppd.c:1203
 msgid "Media Source"
 msgstr "紙張來�"
 
-#: src/main/print-canon.c:1426 src/main/print-escp2.c:190
-#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1169
+#: src/main/print-canon.c:1467 src/main/print-escp2.c:190
+#: src/main/print-lexmark.c:279 src/main/print-olympus.c:1278
 #: src/main/print-pcl.c:1166 src/main/print-ps.c:79
 msgid "Source (input slot) of the media"
 msgstr "�紙匣或者紙張的來�"
 
-#: src/main/print-canon.c:1431 src/main/print-escp2.c:213
-#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1174
-#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1277
+#: src/main/print-canon.c:1472 src/main/print-escp2.c:213
+#: src/main/print-lexmark.c:284 src/main/print-olympus.c:1283
+#: src/main/print-pcl.c:1171 src/main/print-ps.c:84 src/cups/genppd.c:1275
 msgid "Resolution"
 msgstr "解�度"
 
-#: src/main/print-canon.c:1432 src/main/print-lexmark.c:285
-#: src/main/print-olympus.c:1175 src/main/print-pcl.c:1172
+#: src/main/print-canon.c:1473 src/main/print-lexmark.c:285
+#: src/main/print-olympus.c:1284 src/main/print-pcl.c:1172
 #: src/main/print-ps.c:85
 msgid "Resolution and quality of the print"
 msgstr "列�時的解�度��質"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:224
-#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1180
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:224
+#: src/main/print-lexmark.c:290 src/main/print-olympus.c:1289
 #: src/main/print-pcl.c:1177 src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Ink Type"
 msgstr "墨水類別"
 
-#: src/main/print-canon.c:1437 src/main/print-escp2.c:201
+#: src/main/print-canon.c:1478 src/main/print-escp2.c:201
 #: src/main/print-escp2.c:207 src/main/print-escp2.c:224
 #: src/main/print-escp2.c:260 src/main/print-lexmark.c:290
-#: src/main/print-olympus.c:1180 src/main/print-olympus.c:1186
-#: src/main/print-olympus.c:1192 src/main/print-pcl.c:1177
+#: src/main/print-olympus.c:1289 src/main/print-olympus.c:1295
+#: src/main/print-olympus.c:1301 src/main/print-pcl.c:1177
 #: src/main/print-ps.c:90 src/main/print-raw.c:80
 msgid "Advanced Printer Setup"
 msgstr "進階�表機設定"
 
-#: src/main/print-canon.c:1438 src/main/print-escp2.c:225
+#: src/main/print-canon.c:1479 src/main/print-escp2.c:225
 #: src/main/print-escp2.c:237 src/main/print-lexmark.c:291
-#: src/main/print-olympus.c:1181 src/main/print-pcl.c:1178
+#: src/main/print-olympus.c:1290 src/main/print-pcl.c:1178
 #: src/main/print-ps.c:91 src/main/print-raw.c:81
 msgid "Type of ink in the printer"
 msgstr "�表機墨水的類型"
 
-#: src/main/print-canon.c:1443 src/main/print-canon.c:1444
+#: src/main/print-canon.c:1484 src/main/print-canon.c:1485
 #: src/main/print-escp2.c:308 src/main/print-escp2.c:309
 #: src/main/print-lexmark.c:296 src/main/print-lexmark.c:297
 #: src/main/print-pcl.c:1183 src/main/print-pcl.c:1184
 msgid "Ink Channels"
 msgstr ""
 
-#: src/main/print-canon.c:1443 src/main/print-escp2.c:127
+#: src/main/print-canon.c:1484 src/main/print-escp2.c:127
 #: src/main/print-escp2.c:134 src/main/print-escp2.c:141
 #: src/main/print-escp2.c:272 src/main/print-escp2.c:278
 #: src/main/print-escp2.c:284 src/main/print-escp2.c:290
@@ -428,141 +428,168 @@ msgstr ""
 msgid "Advanced Printer Functionality"
 msgstr "進階�表機功能"
 
-#: src/main/print-canon.c:1449 src/main/print-escp2.c:320
-#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1198
+#: src/main/print-canon.c:1490 src/main/print-escp2.c:320
+#: src/main/print-lexmark.c:302 src/main/print-olympus.c:1307
 #: src/main/print-pcl.c:1189 src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Printing Mode"
 msgstr "列�模�"
 
-#: src/main/print-canon.c:1449 src/main/print-color.c:183
-#: src/main/print-color.c:191 src/main/print-color.c:199
-#: src/main/print-color.c:207 src/main/print-escp2.c:320
+#: src/main/print-canon.c:1490 src/main/print-color.c:184
+#: src/main/print-color.c:192 src/main/print-color.c:200
+#: src/main/print-color.c:208 src/main/print-escp2.c:320
 #: src/main/print-escp2.c:326 src/main/print-lexmark.c:302
-#: src/main/print-olympus.c:1198 src/main/print-pcl.c:1189
+#: src/main/print-olympus.c:1307 src/main/print-pcl.c:1189
 #: src/main/print-ps.c:102 src/main/print-raw.c:86
 msgid "Core Parameter"
 msgstr ""
 
-#: src/main/print-canon.c:1450 src/main/print-escp2.c:321
-#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1199
+#: src/main/print-canon.c:1491 src/main/print-escp2.c:321
+#: src/main/print-lexmark.c:303 src/main/print-olympus.c:1308
 #: src/main/print-pcl.c:1190 src/main/print-ps.c:103 src/main/print-raw.c:87
 msgid "Printing Output Mode"
 msgstr ""
 
-#: src/main/print-canon.c:1472 src/main/print-escp2.c:412
+#: src/main/print-canon.c:1496 src/main/print-pcl.c:1195
+msgid "Double-Sided Printing"
+msgstr "雙�列�"
+
+#: src/main/print-canon.c:1497 src/main/print-pcl.c:1196
+msgid "Duplex/Tumble Setting"
+msgstr ""
+
+#: src/main/print-canon.c:1519 src/main/print-escp2.c:412
 #: src/main/print-lexmark.c:325 src/main/print-pcl.c:1218
 msgid "Cyan Density"
 msgstr "氰�色密度"
 
-#: src/main/print-canon.c:1473 src/main/print-escp2.c:413
+#: src/main/print-canon.c:1520 src/main/print-escp2.c:413
 #: src/main/print-lexmark.c:326 src/main/print-pcl.c:1219
 msgid "Adjust the cyan density"
 msgstr "調整氰�色色彩密度"
 
-#: src/main/print-canon.c:1480 src/main/print-escp2.c:420
+#: src/main/print-canon.c:1527 src/main/print-escp2.c:420
 #: src/main/print-lexmark.c:333 src/main/print-pcl.c:1226
 msgid "Magenta Density"
 msgstr "洋紅色密度"
 
-#: src/main/print-canon.c:1481 src/main/print-escp2.c:421
+#: src/main/print-canon.c:1528 src/main/print-escp2.c:421
 #: src/main/print-lexmark.c:334 src/main/print-pcl.c:1227
 msgid "Adjust the magenta density"
 msgstr "調整洋紅色色彩密度"
 
-#: src/main/print-canon.c:1488 src/main/print-escp2.c:428
+#: src/main/print-canon.c:1535 src/main/print-escp2.c:428
 #: src/main/print-lexmark.c:341 src/main/print-pcl.c:1234
 msgid "Yellow Density"
 msgstr "黃色密度"
 
-#: src/main/print-canon.c:1489 src/main/print-escp2.c:429
+#: src/main/print-canon.c:1536 src/main/print-escp2.c:429
 #: src/main/print-lexmark.c:342 src/main/print-pcl.c:1235
 msgid "Adjust the yellow density"
 msgstr "調整黃色色彩密度"
 
-#: src/main/print-canon.c:1496 src/main/print-escp2.c:436
+#: src/main/print-canon.c:1543 src/main/print-escp2.c:436
 #: src/main/print-lexmark.c:349 src/main/print-pcl.c:1242
 msgid "Black Density"
 msgstr "黑色密度"
 
-#: src/main/print-canon.c:1497 src/main/print-escp2.c:437
+#: src/main/print-canon.c:1544 src/main/print-escp2.c:437
 #: src/main/print-lexmark.c:350 src/main/print-pcl.c:1243
 msgid "Adjust the black density"
 msgstr "調整黑色色彩密度"
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1505
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1552
 #: src/main/print-escp2.c:468 src/main/print-escp2.c:469
 #: src/main/print-lexmark.c:357 src/main/print-lexmark.c:358
 #: src/main/print-pcl.c:1250 src/main/print-pcl.c:1251
 msgid "Light Cyan Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1504 src/main/print-canon.c:1512
-#: src/main/print-canon.c:1520 src/main/print-escp2.c:468
+#: src/main/print-canon.c:1551 src/main/print-canon.c:1559
+#: src/main/print-canon.c:1567 src/main/print-escp2.c:468
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:484
 #: src/main/print-escp2.c:492 src/main/print-escp2.c:500
 #: src/main/print-escp2.c:508 src/main/print-escp2.c:516
-#: src/main/print-escp2.c:524 src/main/print-lexmark.c:357
-#: src/main/print-lexmark.c:365 src/main/print-pcl.c:1250
-#: src/main/print-pcl.c:1258
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:532
+#: src/main/print-lexmark.c:357 src/main/print-lexmark.c:365
+#: src/main/print-pcl.c:1250 src/main/print-pcl.c:1258
 msgid "Advanced Ink Adjustment"
 msgstr ""
 
-#: src/main/print-canon.c:1512 src/main/print-canon.c:1513
+#: src/main/print-canon.c:1559 src/main/print-canon.c:1560
 #: src/main/print-escp2.c:476 src/main/print-escp2.c:477
 #: src/main/print-lexmark.c:365 src/main/print-lexmark.c:366
 #: src/main/print-pcl.c:1258 src/main/print-pcl.c:1259
 msgid "Light Magenta Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1520 src/main/print-canon.c:1521
+#: src/main/print-canon.c:1567 src/main/print-canon.c:1568
 msgid "Light Yellow Transition"
 msgstr ""
 
-#: src/main/print-canon.c:1834 src/main/print-lexmark.c:1118
+#: src/main/print-canon.c:1589 src/main/print-pcl.c:1439
+#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:456
+#: src/main/escp2-resolutions.c:467 src/main/escp2-resolutions.c:479
+msgid "Off"
+msgstr ""
+
+#: src/main/print-canon.c:1591 src/main/print-pcl.c:1441
+msgid "Short Edge (Flip)"
+msgstr ""
+
+#: src/main/print-canon.c:1901 src/main/print-lexmark.c:1118
 msgid "Auto Sheet Feeder"
 msgstr "自動�紙匣"
 
-#: src/main/print-canon.c:1835 src/main/print-lexmark.c:1119
+#: src/main/print-canon.c:1902 src/main/print-lexmark.c:1119
 msgid "Manual with Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1836 src/main/print-lexmark.c:1120
+#: src/main/print-canon.c:1903 src/main/print-lexmark.c:1120
 msgid "Manual without Pause"
 msgstr ""
 
-#: src/main/print-canon.c:1948 src/main/print-color.c:305
-#: src/main/print-escp2-data.c:573 src/main/print-escp2-data.c:583
-#: src/main/print-escp2-data.c:595 src/main/print-escp2-data.c:608
-#: src/main/print-escp2-data.c:621 src/main/print-escp2-data.c:627
-#: src/main/print-lexmark.c:613 src/gutenprintui/panel.c:2131
-#: src/gutenprintui2/panel.c:2129 src/escputil/escputil.c:861
+#: src/main/print-canon.c:1904
+msgid "Cassette"
+msgstr ""
+
+#: src/main/print-canon.c:1905
+msgid "CD tray"
+msgstr ""
+
+#: src/main/print-canon.c:2017 src/main/print-color.c:314
+#: src/main/print-escp2-data.c:579 src/main/print-escp2-data.c:589
+#: src/main/print-escp2-data.c:601 src/main/print-escp2-data.c:614
+#: src/main/print-escp2-data.c:627 src/main/print-escp2-data.c:633
+#: src/main/print-escp2-data.c:658 src/main/print-lexmark.c:613
+#: src/gutenprintui/panel.c:2134 src/gutenprintui2/panel.c:2132
+#: src/escputil/escputil.c:861
 msgid "Black"
 msgstr "黑"
 
-#: src/main/print-canon.c:1951
+#: src/main/print-canon.c:2020
 msgid "CMY Color"
 msgstr "CMY 色系"
 
-#: src/main/print-canon.c:1954
+#: src/main/print-canon.c:2023
 msgid "CMYK Color"
 msgstr "CMYK 色系"
 
-#: src/main/print-canon.c:1957
+#: src/main/print-canon.c:2026
 msgid "Photo CcMmY Color"
 msgstr ""
 
-#: src/main/print-canon.c:1960
+#: src/main/print-canon.c:2029
 msgid "Photo CcMmYK Color"
 msgstr ""
 
-#: src/main/print-canon.c:2004 src/main/print-escp2.c:1738
-#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1453
+#: src/main/print-canon.c:2073 src/main/print-escp2.c:1752
+#: src/main/print-lexmark.c:1283 src/main/print-olympus.c:1562
 #: src/main/print-pcl.c:1733 src/main/print-ps.c:167 src/main/print-raw.c:135
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color"
 msgstr "彩色"
 
-#: src/main/print-canon.c:2006 src/main/print-escp2.c:1740
+#: src/main/print-canon.c:2075 src/main/print-escp2.c:1754
 #: src/main/print-lexmark.c:1285 src/main/print-pcl.c:1735
 #: src/main/print-ps.c:169 src/main/print-raw.c:137
 msgid "Black and White"
@@ -600,9 +627,9 @@ msgstr ""
 msgid "Pre-Dithered"
 msgstr ""
 
-#: src/main/print-color.c:121 src/main/escp2-channels.c:626
-#: src/main/escp2-channels.c:639 src/main/escp2-channels.c:653
-#: src/gutenprintui/panel.c:282 src/gutenprintui2/panel.c:282
+#: src/main/print-color.c:121 src/main/escp2-channels.c:695
+#: src/main/escp2-channels.c:708 src/main/escp2-channels.c:722
+#: src/gutenprintui/panel.c:286 src/gutenprintui2/panel.c:286
 msgid "Grayscale"
 msgstr "�階"
 
@@ -626,103 +653,112 @@ msgstr "CMYK"
 msgid "KCMY"
 msgstr "KCMY"
 
-#: src/main/print-color.c:164 src/main/print-color.c:436
+#: src/main/print-color.c:165 src/main/print-color.c:446
 msgid "Channel "
 msgstr ""
 
-#: src/main/print-color.c:164
+#: src/main/print-color.c:165
 msgid " Gamma"
 msgstr " Gamma"
 
-#: src/main/print-color.c:164 src/main/print-color.c:239
-#: src/main/print-color.c:249 src/main/print-color.c:257
-#: src/main/print-color.c:265 src/main/print-color.c:273
-#: src/main/print-color.c:281 src/main/print-color.c:289
-#: src/main/print-color.c:297 src/main/print-color.c:305
-#: src/gutenprintui2/gammacurve.c:408
+#: src/main/print-color.c:165 src/main/print-color.c:216
+#: src/main/print-color.c:248 src/main/print-color.c:258
+#: src/main/print-color.c:266 src/main/print-color.c:274
+#: src/main/print-color.c:282 src/main/print-color.c:290
+#: src/main/print-color.c:298 src/main/print-color.c:306
+#: src/main/print-color.c:314 src/gutenprintui2/gammacurve.c:408
 msgid "Gamma"
 msgstr "Gamma"
 
-#: src/main/print-color.c:165
+#: src/main/print-color.c:166
 msgid "Gamma for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:175
+#: src/main/print-color.c:176
 msgid "Color Correction"
 msgstr "色彩修正"
 
-#: src/main/print-color.c:175 src/main/print-color.c:215
-#: src/main/print-color.c:223 src/main/print-color.c:337
+#: src/main/print-color.c:176 src/main/print-color.c:224
+#: src/main/print-color.c:232 src/main/print-color.c:346
 #: src/main/generic-options.c:68
 msgid "Basic Image Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:176
+#: src/main/print-color.c:177
 msgid "Color correction to be applied"
 msgstr ""
 
-#: src/main/print-color.c:183
+#: src/main/print-color.c:184
 msgid "Channel Bit Depth"
 msgstr ""
 
-#: src/main/print-color.c:184
+#: src/main/print-color.c:185
 msgid "Bit depth per channel"
 msgstr ""
 
-#: src/main/print-color.c:191
+#: src/main/print-color.c:192
 msgid "Input Image Type"
 msgstr "輸入影�類型"
 
-#: src/main/print-color.c:192
+#: src/main/print-color.c:193
 msgid "Input image type"
 msgstr "輸入影�類型"
 
-#: src/main/print-color.c:199
+#: src/main/print-color.c:200
 msgid "Output Image Type"
 msgstr "輸出影�類型"
 
-#: src/main/print-color.c:200
+#: src/main/print-color.c:201
 msgid "Output image type"
 msgstr "輸出影�類型"
 
-#: src/main/print-color.c:207 src/main/print-color.c:208
+#: src/main/print-color.c:208 src/main/print-color.c:209
 #: src/main/print-escp2.c:326
 msgid "Raw Channels"
 msgstr ""
 
-#: src/main/print-color.c:215
+#: src/main/print-color.c:216
+#, fuzzy
+msgid "SimpleGamma"
+msgstr "Gamma"
+
+#: src/main/print-color.c:217
+msgid "Do not correct for screen gamma"
+msgstr ""
+
+#: src/main/print-color.c:224
 msgid "Brightness"
 msgstr "亮度"
 
-#: src/main/print-color.c:216
+#: src/main/print-color.c:225
 msgid "Brightness of the print"
 msgstr "列�時的亮度"
 
-#: src/main/print-color.c:223
+#: src/main/print-color.c:232
 msgid "Contrast"
 msgstr "�差"
 
-#: src/main/print-color.c:224
+#: src/main/print-color.c:233
 msgid "Contrast of the print (0 is solid gray)"
 msgstr "列�時的�差 (0 代表純�色)"
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Linear Contrast Adjustment"
 msgstr ""
 
-#: src/main/print-color.c:231
+#: src/main/print-color.c:240
 msgid "Advanced Image Control"
 msgstr ""
 
-#: src/main/print-color.c:232
+#: src/main/print-color.c:241
 msgid "Use linear vs. fixed end point contrast adjustment"
 msgstr ""
 
-#: src/main/print-color.c:239
+#: src/main/print-color.c:248
 msgid "Composite Gamma"
 msgstr ""
 
-#: src/main/print-color.c:240
+#: src/main/print-color.c:249
 msgid ""
 "Adjust the gamma of the print. Larger values will produce a generally "
 "brighter print, while smaller values will produce a generally darker print. "
@@ -730,114 +766,120 @@ msgstr ""
 "調整列�時的 gamma 值。數值較大時，一般會令列�出來的影�較光亮；相�地，數值"
 "較�時，列�出來的影�則較暗。"
 
-#: src/main/print-color.c:249
+#: src/main/print-color.c:258
 msgid "AppGamma"
 msgstr ""
 
-#: src/main/print-color.c:250
+#: src/main/print-color.c:259
 msgid "Gamma value assumed by application"
 msgstr "程�使用的 Gamma 值"
 
-#: src/main/print-color.c:257 src/main/print-escp2-data.c:574
-#: src/main/print-escp2-data.c:584 src/main/print-escp2-data.c:596
-#: src/main/print-escp2-data.c:609 src/main/print-escp2-data.c:622
-#: src/main/print-escp2-data.c:636 src/gutenprintui/panel.c:2110
-#: src/gutenprintui2/panel.c:2108 src/escputil/escputil.c:864
+#: src/main/print-color.c:266 src/main/print-escp2-data.c:580
+#: src/main/print-escp2-data.c:590 src/main/print-escp2-data.c:602
+#: src/main/print-escp2-data.c:615 src/main/print-escp2-data.c:628
+#: src/main/print-escp2-data.c:642 src/main/print-escp2-data.c:659
+#: src/gutenprintui/panel.c:2113 src/gutenprintui2/panel.c:2111
+#: src/escputil/escputil.c:864
 msgid "Cyan"
 msgstr "æ°°è—�"
 
-#: src/main/print-color.c:258
+#: src/main/print-color.c:267
 msgid "Adjust the cyan gamma"
 msgstr "調整氰�色 gamma 值"
 
-#: src/main/print-color.c:265 src/main/print-escp2-data.c:575
-#: src/main/print-escp2-data.c:585 src/main/print-escp2-data.c:597
-#: src/main/print-escp2-data.c:610 src/main/print-escp2-data.c:623
-#: src/main/print-escp2-data.c:635 src/gutenprintui/panel.c:2117
-#: src/gutenprintui2/panel.c:2115 src/escputil/escputil.c:865
+#: src/main/print-color.c:274 src/main/print-escp2-data.c:581
+#: src/main/print-escp2-data.c:591 src/main/print-escp2-data.c:603
+#: src/main/print-escp2-data.c:616 src/main/print-escp2-data.c:629
+#: src/main/print-escp2-data.c:641 src/main/print-escp2-data.c:660
+#: src/gutenprintui/panel.c:2120 src/gutenprintui2/panel.c:2118
+#: src/escputil/escputil.c:865
 msgid "Magenta"
 msgstr "æ´‹ç´…"
 
-#: src/main/print-color.c:266
+#: src/main/print-color.c:275
 msgid "Adjust the magenta gamma"
 msgstr "調整洋紅色 gamma 值"
 
-#: src/main/print-color.c:273 src/main/print-escp2-data.c:576
-#: src/main/print-escp2-data.c:586 src/main/print-escp2-data.c:598
-#: src/main/print-escp2-data.c:611 src/main/print-escp2-data.c:624
-#: src/main/print-escp2-data.c:634 src/gutenprintui/panel.c:2124
-#: src/gutenprintui2/panel.c:2122 src/escputil/escputil.c:866
+#: src/main/print-color.c:282 src/main/print-escp2-data.c:582
+#: src/main/print-escp2-data.c:592 src/main/print-escp2-data.c:604
+#: src/main/print-escp2-data.c:617 src/main/print-escp2-data.c:630
+#: src/main/print-escp2-data.c:640 src/main/print-escp2-data.c:661
+#: src/gutenprintui/panel.c:2127 src/gutenprintui2/panel.c:2125
+#: src/escputil/escputil.c:866
 msgid "Yellow"
 msgstr "黃"
 
-#: src/main/print-color.c:274
+#: src/main/print-color.c:283
 msgid "Adjust the yellow gamma"
 msgstr "調整黃色 gamma 值"
 
-#: src/main/print-color.c:281 src/main/print-escp2-data.c:639
-#: src/escputil/escputil.c:872
+#: src/main/print-color.c:290 src/main/print-escp2-data.c:645
+#: src/gutenprintui/panel.c:2141 src/gutenprintui2/panel.c:2139
+#: src/escputil/escputil.c:873
 msgid "Red"
 msgstr "ç´…"
 
-#: src/main/print-color.c:282
+#: src/main/print-color.c:291
 msgid "Adjust the red gamma"
 msgstr "調整紅色 gamma 值"
 
-#: src/main/print-color.c:289
+#: src/main/print-color.c:298 src/gutenprintui/panel.c:2148
+#: src/gutenprintui2/panel.c:2146
 msgid "Green"
 msgstr "綠"
 
-#: src/main/print-color.c:290
+#: src/main/print-color.c:299
 msgid "Adjust the green gamma"
 msgstr "調整綠色 gamma 值"
 
-#: src/main/print-color.c:297 src/main/print-escp2-data.c:640
-#: src/escputil/escputil.c:873
+#: src/main/print-color.c:306 src/main/print-escp2-data.c:646
+#: src/gutenprintui/panel.c:2155 src/gutenprintui2/panel.c:2153
+#: src/escputil/escputil.c:874
 msgid "Blue"
 msgstr "è—�"
 
-#: src/main/print-color.c:298
+#: src/main/print-color.c:307
 msgid "Adjust the blue gamma"
 msgstr "調整�色 gamma 值"
 
-#: src/main/print-color.c:306
+#: src/main/print-color.c:315
 msgid "Adjust the black gamma"
 msgstr "調整黑色 gamma 值"
 
-#: src/main/print-color.c:313 src/main/print-olympus.c:1221
+#: src/main/print-color.c:322 src/main/print-olympus.c:1330
 msgid "Cyan Balance"
 msgstr "氰�色平衡"
 
-#: src/main/print-color.c:313 src/main/print-color.c:321
-#: src/main/print-color.c:329
+#: src/main/print-color.c:322 src/main/print-color.c:330
+#: src/main/print-color.c:338
 msgid "GrayBalance"
 msgstr ""
 
-#: src/main/print-color.c:314
+#: src/main/print-color.c:323
 msgid "Adjust the cyan gray balance"
 msgstr ""
 
-#: src/main/print-color.c:321 src/main/print-olympus.c:1229
+#: src/main/print-color.c:330 src/main/print-olympus.c:1338
 msgid "Magenta Balance"
 msgstr "洋紅色平衡"
 
-#: src/main/print-color.c:322
+#: src/main/print-color.c:331
 msgid "Adjust the magenta gray balance"
 msgstr ""
 
-#: src/main/print-color.c:329 src/main/print-olympus.c:1237
+#: src/main/print-color.c:338 src/main/print-olympus.c:1346
 msgid "Yellow Balance"
 msgstr "黃色平衡"
 
-#: src/main/print-color.c:330
+#: src/main/print-color.c:339
 msgid "Adjust the yellow gray balance"
 msgstr ""
 
-#: src/main/print-color.c:337
+#: src/main/print-color.c:346
 msgid "Saturation"
 msgstr "彩度"
 
-#: src/main/print-color.c:338
+#: src/main/print-color.c:347
 msgid ""
 "Adjust the saturation (color balance) of the print\n"
 "Use zero saturation to produce grayscale output using color and black inks"
@@ -845,164 +887,164 @@ msgstr ""
 "調整列�時的彩度 (色彩平衡)\n"
 "將彩度設定為 0，表示使用�色墨水�黑色墨水產生�階影�"
 
-#: src/main/print-color.c:348
+#: src/main/print-color.c:357
 msgid "Ink Limit"
 msgstr ""
 
-#: src/main/print-color.c:348 src/main/print-color.c:356
-#: src/main/print-color.c:364 src/main/print-color.c:372
-#: src/main/print-color.c:535 src/main/print-escp2.c:332
+#: src/main/print-color.c:357 src/main/print-color.c:365
+#: src/main/print-color.c:373 src/main/print-color.c:381
+#: src/main/print-color.c:545 src/main/print-escp2.c:332
 #: src/main/print-escp2.c:338 src/main/print-escp2.c:344
 #: src/main/print-escp2.c:350 src/main/print-escp2.c:356
 msgid "Advanced Output Control"
 msgstr ""
 
-#: src/main/print-color.c:349
+#: src/main/print-color.c:358
 msgid "Limit the total ink printed to the page"
 msgstr ""
 
-#: src/main/print-color.c:356
+#: src/main/print-color.c:365
 msgid "GCR Transition"
 msgstr ""
 
-#: src/main/print-color.c:357
+#: src/main/print-color.c:366
 msgid "Adjust the gray component transition rate"
 msgstr ""
 
-#: src/main/print-color.c:364
+#: src/main/print-color.c:373
 msgid "GCR Lower Bound"
 msgstr ""
 
-#: src/main/print-color.c:365
+#: src/main/print-color.c:374
 msgid "Lower bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:372
+#: src/main/print-color.c:381
 msgid "GCR Upper Bound"
 msgstr ""
 
-#: src/main/print-color.c:373
+#: src/main/print-color.c:382
 msgid "Upper bound of gray component reduction"
 msgstr ""
 
-#: src/main/print-color.c:436
+#: src/main/print-color.c:446
 msgid " Curve"
 msgstr ""
 
-#: src/main/print-color.c:437 src/main/print-color.c:447
-#: src/main/print-color.c:455 src/main/print-color.c:463
-#: src/main/print-color.c:471 src/main/print-color.c:479
-#: src/main/print-color.c:487 src/main/print-color.c:495
-#: src/main/print-color.c:503
+#: src/main/print-color.c:447 src/main/print-color.c:457
+#: src/main/print-color.c:465 src/main/print-color.c:473
+#: src/main/print-color.c:481 src/main/print-color.c:489
+#: src/main/print-color.c:497 src/main/print-color.c:505
+#: src/main/print-color.c:513
 msgid "Output Curves"
 msgstr ""
 
-#: src/main/print-color.c:437
+#: src/main/print-color.c:447
 msgid "Curve for raw channel "
 msgstr ""
 
-#: src/main/print-color.c:447
+#: src/main/print-color.c:457
 msgid "Cyan Curve"
 msgstr "氰�色曲線"
 
-#: src/main/print-color.c:448
+#: src/main/print-color.c:458
 msgid "Cyan curve"
 msgstr "氰�色曲線"
 
-#: src/main/print-color.c:455
+#: src/main/print-color.c:465
 msgid "Magenta Curve"
 msgstr "洋紅色曲線"
 
-#: src/main/print-color.c:456
+#: src/main/print-color.c:466
 msgid "Magenta curve"
 msgstr "洋紅色曲線"
 
-#: src/main/print-color.c:463
+#: src/main/print-color.c:473
 msgid "Yellow Curve"
 msgstr "黃色曲線"
 
-#: src/main/print-color.c:464
+#: src/main/print-color.c:474
 msgid "Yellow curve"
 msgstr "黃色曲線"
 
-#: src/main/print-color.c:471
+#: src/main/print-color.c:481
 msgid "Black Curve"
 msgstr "黑色曲線"
 
-#: src/main/print-color.c:472
+#: src/main/print-color.c:482
 msgid "Black curve"
 msgstr "黑色曲線"
 
-#: src/main/print-color.c:479
+#: src/main/print-color.c:489
 msgid "Red Curve"
 msgstr "紅色曲線"
 
-#: src/main/print-color.c:480
+#: src/main/print-color.c:490
 msgid "Red curve"
 msgstr "紅色曲線"
 
-#: src/main/print-color.c:487
+#: src/main/print-color.c:497
 msgid "Green Curve"
 msgstr "綠色曲線"
 
-#: src/main/print-color.c:488
+#: src/main/print-color.c:498
 msgid "Green curve"
 msgstr "綠色曲線"
 
-#: src/main/print-color.c:495
+#: src/main/print-color.c:505
 msgid "Blue Curve"
 msgstr "�色曲線"
 
-#: src/main/print-color.c:496
+#: src/main/print-color.c:506
 msgid "Blue curve"
 msgstr "�色曲線"
 
-#: src/main/print-color.c:503
+#: src/main/print-color.c:513
 msgid "White Curve"
 msgstr "白色曲線"
 
-#: src/main/print-color.c:504
+#: src/main/print-color.c:514
 msgid "White curve"
 msgstr "白色曲線"
 
-#: src/main/print-color.c:511
+#: src/main/print-color.c:521
 msgid "Hue Map"
 msgstr ""
 
-#: src/main/print-color.c:511 src/main/print-color.c:519
-#: src/main/print-color.c:527
+#: src/main/print-color.c:521 src/main/print-color.c:529
+#: src/main/print-color.c:537
 msgid "Advanced HSL Curves"
 msgstr ""
 
-#: src/main/print-color.c:512
+#: src/main/print-color.c:522
 msgid "Hue adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:519
+#: src/main/print-color.c:529
 msgid "Saturation Map"
 msgstr ""
 
-#: src/main/print-color.c:520
+#: src/main/print-color.c:530
 msgid "Saturation adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:527
+#: src/main/print-color.c:537
 msgid "Luminosity Map"
 msgstr ""
 
-#: src/main/print-color.c:528
+#: src/main/print-color.c:538
 msgid "Luminosity adjustment curve"
 msgstr ""
 
-#: src/main/print-color.c:535
+#: src/main/print-color.c:545
 msgid "Gray Component Reduction"
 msgstr ""
 
-#: src/main/print-color.c:536
+#: src/main/print-color.c:546
 msgid "Gray component reduction curve"
 msgstr ""
 
-#: src/main/print-color.c:1620
+#: src/main/print-color.c:1675
 msgid "Traditional Gutenprint color conversion"
 msgstr ""
 
@@ -1090,119 +1132,124 @@ msgid ""
 "d\n"
 msgstr ""
 
-#: src/main/print-escp2-data.c:290 src/main/print-escp2-data.c:318
-#: src/main/print-escp2-data.c:355 src/main/print-escp2-data.c:410
-#: src/main/print-escp2-data.c:456 src/main/print-escp2-data.c:549
-#: src/main/print-escp2.c:1494 src/main/print-escp2.c:1591
-#: src/main/print-escp2.c:1603 src/main/print-pcl.c:227
-#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2549
-#: src/gutenprintui2/panel.c:2573
+#: src/main/print-escp2-data.c:296 src/main/print-escp2-data.c:324
+#: src/main/print-escp2-data.c:361 src/main/print-escp2-data.c:416
+#: src/main/print-escp2-data.c:462 src/main/print-escp2-data.c:555
+#: src/main/print-escp2.c:1504 src/main/print-escp2.c:1601
+#: src/main/print-escp2.c:1613 src/main/print-pcl.c:227
+#: src/main/generic-options.c:36 src/gutenprintui/panel.c:2573
+#: src/gutenprintui2/panel.c:2597
 msgid "Standard"
 msgstr "標準"
 
-#: src/main/print-escp2-data.c:299 src/main/print-escp2-data.c:437
-#: src/main/print-escp2-data.c:465
+#: src/main/print-escp2-data.c:305 src/main/print-escp2-data.c:443
+#: src/main/print-escp2-data.c:471
 msgid "Roll Feed"
 msgstr ""
 
-#: src/main/print-escp2-data.c:327 src/main/print-escp2-data.c:382
+#: src/main/print-escp2-data.c:333 src/main/print-escp2-data.c:388
 msgid "Roll Feed (cut each page)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:336 src/main/print-escp2-data.c:391
+#: src/main/print-escp2-data.c:342 src/main/print-escp2-data.c:397
 msgid "Roll Feed (do not cut)"
 msgstr ""
 
-#: src/main/print-escp2-data.c:364 src/main/print-escp2-data.c:419
+#: src/main/print-escp2-data.c:370 src/main/print-escp2-data.c:425
 msgid "Manual Feed"
 msgstr "人手�紙"
 
-#: src/main/print-escp2-data.c:373 src/main/print-escp2-data.c:428
+#: src/main/print-escp2-data.c:379 src/main/print-escp2-data.c:434
 msgid "Print to CD"
 msgstr "列�至光碟"
 
-#: src/main/print-escp2-data.c:484
+#: src/main/print-escp2-data.c:490
 msgid "Cut Sheet Bin 1"
 msgstr ""
 
-#: src/main/print-escp2-data.c:493
+#: src/main/print-escp2-data.c:499
 msgid "Cut Sheet Bin 2"
 msgstr ""
 
-#: src/main/print-escp2-data.c:502
+#: src/main/print-escp2-data.c:508
 msgid "Cut Sheet Autoselect"
 msgstr ""
 
-#: src/main/print-escp2-data.c:511
+#: src/main/print-escp2-data.c:517
 msgid "Manual Selection"
 msgstr ""
 
-#: src/main/print-escp2-data.c:546 src/main/generic-options.c:33
+#: src/main/print-escp2-data.c:552 src/main/generic-options.c:33
 msgid "Fast Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:547 src/main/generic-options.c:34
+#: src/main/print-escp2-data.c:553 src/main/generic-options.c:34
 msgid "Economy"
 msgstr ""
 
-#: src/main/print-escp2-data.c:548 src/main/generic-options.c:35
+#: src/main/print-escp2-data.c:554 src/main/generic-options.c:35
 msgid "Draft"
 msgstr ""
 
-#: src/main/print-escp2-data.c:550 src/main/generic-options.c:37
+#: src/main/print-escp2-data.c:556 src/main/generic-options.c:37
 msgid "High"
 msgstr ""
 
-#: src/main/print-escp2-data.c:551 src/main/generic-options.c:38
+#: src/main/print-escp2-data.c:557 src/main/generic-options.c:38
 msgid "Photo"
 msgstr "相片"
 
-#: src/main/print-escp2-data.c:552 src/main/generic-options.c:39
+#: src/main/print-escp2-data.c:558 src/main/generic-options.c:39
 msgid "Super Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:553 src/main/generic-options.c:40
+#: src/main/print-escp2-data.c:559 src/main/generic-options.c:40
 msgid "Ultra Photo"
 msgstr ""
 
-#: src/main/print-escp2-data.c:554 src/main/generic-options.c:41
+#: src/main/print-escp2-data.c:560 src/main/generic-options.c:41
 msgid "Best"
 msgstr ""
 
-#: src/main/print-escp2-data.c:587 src/main/print-escp2-data.c:599
-#: src/main/print-escp2-data.c:612 src/main/print-escp2-data.c:625
-#: src/escputil/escputil.c:867
+#: src/main/print-escp2-data.c:593 src/main/print-escp2-data.c:605
+#: src/main/print-escp2-data.c:618 src/main/print-escp2-data.c:631
+#: src/main/print-escp2-data.c:656 src/escputil/escputil.c:867
 msgid "Light Cyan"
 msgstr ""
 
-#: src/main/print-escp2-data.c:588 src/main/print-escp2-data.c:600
-#: src/main/print-escp2-data.c:613 src/main/print-escp2-data.c:626
-#: src/escputil/escputil.c:868
+#: src/main/print-escp2-data.c:594 src/main/print-escp2-data.c:606
+#: src/main/print-escp2-data.c:619 src/main/print-escp2-data.c:632
+#: src/main/print-escp2-data.c:655 src/escputil/escputil.c:868
 msgid "Light Magenta"
 msgstr ""
 
-#: src/main/print-escp2-data.c:601 src/escputil/escputil.c:870
+#: src/main/print-escp2-data.c:607 src/main/print-escp2-data.c:657
+#: src/escputil/escputil.c:871
 msgid "Light Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:614 src/escputil/escputil.c:869
+#: src/main/print-escp2-data.c:620
 msgid "Dark Yellow"
 msgstr ""
 
-#: src/main/print-escp2-data.c:637 src/main/escp2-channels.c:2054
-#: src/escputil/escputil.c:862
+#: src/main/print-escp2-data.c:643 src/main/escp2-channels.c:2293
+#: src/main/escp2-channels.c:2309 src/escputil/escputil.c:872
 msgid "Matte Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:638 src/main/escp2-channels.c:2072
-#: src/escputil/escputil.c:863
+#: src/main/print-escp2-data.c:644 src/main/escp2-channels.c:2289
+#: src/main/escp2-channels.c:2327 src/escputil/escputil.c:862
 msgid "Photo Black"
 msgstr ""
 
-#: src/main/print-escp2-data.c:641 src/escputil/escputil.c:874
+#: src/main/print-escp2-data.c:647 src/escputil/escputil.c:875
 msgid "Gloss Optimizer"
 msgstr ""
 
+#: src/main/print-escp2-data.c:654 src/escputil/escputil.c:876
+msgid "Light Light Black"
+msgstr ""
+
 #: src/main/print-escp2.c:159
 msgid "Automatic Printing Mode"
 msgstr ""
@@ -1269,11 +1316,11 @@ msgstr ""
 msgid "Printing direction (unidirectional is higher quality, but slower)"
 msgstr ""
 
-#: src/main/print-escp2.c:248 src/main/print-olympus.c:1192
+#: src/main/print-escp2.c:248 src/main/print-olympus.c:1301
 msgid "Borderless"
 msgstr ""
 
-#: src/main/print-escp2.c:249 src/main/print-olympus.c:1193
+#: src/main/print-escp2.c:249 src/main/print-olympus.c:1302
 msgid "Print without borders"
 msgstr ""
 
@@ -1403,96 +1450,97 @@ msgid "Gray Transition"
 msgstr ""
 
 #: src/main/print-escp2.c:500 src/main/print-escp2.c:501
+#: src/main/print-escp2.c:524 src/main/print-escp2.c:525
+msgid "Light Gray Transition"
+msgstr ""
+
+#: src/main/print-escp2.c:508 src/main/print-escp2.c:509
 msgid "Dark Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:508
+#: src/main/print-escp2.c:516
 msgid "Mid Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:509
+#: src/main/print-escp2.c:517
 msgid "Medium Gray Transition"
 msgstr ""
 
-#: src/main/print-escp2.c:516 src/main/print-escp2.c:517
-msgid "Light Gray Transition"
-msgstr ""
-
-#: src/main/print-escp2.c:524
+#: src/main/print-escp2.c:532
 msgid "Red and Blue Ink Usage"
 msgstr ""
 
-#: src/main/print-escp2.c:525
+#: src/main/print-escp2.c:533
 msgid "Amount of red and blue ink to use"
 msgstr ""
 
-#: src/main/print-escp2.c:1377
+#: src/main/print-escp2.c:1387
 msgid "Full Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1379
+#: src/main/print-escp2.c:1389
 msgid "Automatic Setting Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1390 src/main/xmli18n-tmp.h:6
+#: src/main/print-escp2.c:1400 src/main/xmli18n-tmp.h:6
 msgid "CD - 5 inch"
 msgstr "5 �光碟"
 
-#: src/main/print-escp2.c:1392 src/main/xmli18n-tmp.h:7
+#: src/main/print-escp2.c:1402 src/main/xmli18n-tmp.h:7
 msgid "CD - 3 inch"
 msgstr "3 �光碟"
 
-#: src/main/print-escp2.c:1414
+#: src/main/print-escp2.c:1424
 msgid "Normal"
 msgstr ""
 
-#: src/main/print-escp2.c:1416
+#: src/main/print-escp2.c:1426
 msgid "Print To Hub"
 msgstr ""
 
-#: src/main/print-escp2.c:1441 src/main/generic-options.c:213
+#: src/main/print-escp2.c:1451 src/main/generic-options.c:213
 #: src/main/generic-options.c:230
 msgid "Manual Control"
 msgstr ""
 
-#: src/main/print-escp2.c:1568 src/cups/genppd.c:1286
+#: src/main/print-escp2.c:1578 src/cups/genppd.c:1284
 msgid "Automatic"
 msgstr "自動"
 
-#: src/main/print-escp2.c:1570
+#: src/main/print-escp2.c:1580
 msgid "Bidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1572
+#: src/main/print-escp2.c:1582
 msgid "Unidirectional"
 msgstr ""
 
-#: src/main/print-escp2.c:1605
+#: src/main/print-escp2.c:1615
 msgid "Alternate Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1607
+#: src/main/print-escp2.c:1617
 msgid "Ascending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1609
+#: src/main/print-escp2.c:1619
 msgid "Descending Fill"
 msgstr ""
 
-#: src/main/print-escp2.c:1611
+#: src/main/print-escp2.c:1621
 msgid "Ascending Double"
 msgstr ""
 
-#: src/main/print-escp2.c:1613
+#: src/main/print-escp2.c:1623
 msgid "Nearest Neighbor Avoidance"
 msgstr ""
 
-#: src/main/print-escp2.c:2011
+#: src/main/print-escp2.c:2026
 #, c-format
 msgid "This printer does not support raw printer output at depth %d\n"
 msgstr ""
 
-#: src/main/print-escp2.c:2955 src/main/print-olympus.c:1642
+#: src/main/print-escp2.c:2970 src/main/print-olympus.c:1752
 #: src/main/print-raw.c:217
 msgid "Print options not verified; cannot print.\n"
 msgstr ""
@@ -1546,145 +1594,156 @@ msgid "test print"
 msgstr ""
 
 #: src/main/print-lexmark.c:601 src/main/print-lexmark.c:671
-#: src/main/escp2-channels.c:909 src/main/escp2-channels.c:923
-#: src/main/escp2-channels.c:937 src/main/escp2-channels.c:961
-#: src/main/escp2-channels.c:975 src/main/escp2-channels.c:989
-#: src/main/escp2-channels.c:1003 src/main/escp2-channels.c:1017
-#: src/main/escp2-channels.c:1031
+#: src/main/escp2-channels.c:1026 src/main/escp2-channels.c:1040
+#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
+#: src/main/escp2-channels.c:1092 src/main/escp2-channels.c:1106
+#: src/main/escp2-channels.c:1120 src/main/escp2-channels.c:1134
+#: src/main/escp2-channels.c:1148 src/main/escp2-channels.c:1162
 msgid "Four Color Standard"
 msgstr ""
 
 #: src/main/print-lexmark.c:604 src/main/print-lexmark.c:674
-#: src/main/escp2-channels.c:786 src/main/escp2-channels.c:800
-#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:828
-#: src/main/escp2-channels.c:842 src/main/escp2-channels.c:856
-#: src/main/escp2-channels.c:880 src/main/escp2-channels.c:886
+#: src/main/escp2-channels.c:890 src/main/escp2-channels.c:904
+#: src/main/escp2-channels.c:918 src/main/escp2-channels.c:932
+#: src/main/escp2-channels.c:946 src/main/escp2-channels.c:960
+#: src/main/escp2-channels.c:984 src/main/escp2-channels.c:990
+#: src/main/escp2-channels.c:1004
 msgid "Three Color Composite"
 msgstr ""
 
 #: src/main/print-lexmark.c:607 src/main/print-lexmark.c:677
-#: src/main/escp2-channels.c:1091 src/main/escp2-channels.c:1105
-#: src/main/escp2-channels.c:1295 src/main/escp2-channels.c:1310
-#: src/main/escp2-channels.c:1327
+#: src/main/escp2-channels.c:1236 src/main/escp2-channels.c:1250
+#: src/main/escp2-channels.c:1264 src/main/escp2-channels.c:1490
+#: src/main/escp2-channels.c:1505 src/main/escp2-channels.c:1522
 msgid "Six Color Photo"
 msgstr ""
 
 #: src/main/print-lexmark.c:610 src/main/print-lexmark.c:680
-#: src/main/escp2-channels.c:1054 src/main/escp2-channels.c:1068
-#: src/main/escp2-channels.c:1239 src/main/escp2-channels.c:1254
-#: src/main/escp2-channels.c:1271
+#: src/main/escp2-channels.c:1185 src/main/escp2-channels.c:1199
+#: src/main/escp2-channels.c:1213 src/main/escp2-channels.c:1434
+#: src/main/escp2-channels.c:1449 src/main/escp2-channels.c:1466
 msgid "Five Color Photo Composite"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:971
-#: src/main/escp2-papers.c:1015 src/main/escp2-papers.c:1059
-#: src/main/escp2-papers.c:1107 src/main/escp2-papers.c:1151
+#: src/main/print-lexmark.c:861 src/main/escp2-papers.c:1156
+#: src/main/escp2-papers.c:1200 src/main/escp2-papers.c:1244
+#: src/main/escp2-papers.c:1292 src/main/escp2-papers.c:1340
+#: src/main/escp2-papers.c:1384
 msgid "Glossy Film"
 msgstr "光�膠片"
 
-#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:975
-#: src/main/escp2-papers.c:1019 src/main/escp2-papers.c:1063
-#: src/main/escp2-papers.c:1111 src/main/escp2-papers.c:1155
+#: src/main/print-lexmark.c:869 src/main/escp2-papers.c:1160
+#: src/main/escp2-papers.c:1204 src/main/escp2-papers.c:1248
+#: src/main/escp2-papers.c:1296 src/main/escp2-papers.c:1344
+#: src/main/escp2-papers.c:1388
 msgid "Envelopes"
 msgstr "ä¿¡å°�"
 
 # (Abel) from fuji, epson
-#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:979
-#: src/main/escp2-papers.c:1023 src/main/escp2-papers.c:1067
-#: src/main/escp2-papers.c:1115 src/main/escp2-papers.c:1159
+#: src/main/print-lexmark.c:873 src/main/escp2-papers.c:1164
+#: src/main/escp2-papers.c:1208 src/main/escp2-papers.c:1252
+#: src/main/escp2-papers.c:1300 src/main/escp2-papers.c:1348
+#: src/main/escp2-papers.c:1392
 msgid "Matte Paper"
 msgstr "雪�銅版紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:983
-#: src/main/escp2-papers.c:1027 src/main/escp2-papers.c:1071
-#: src/main/escp2-papers.c:1119 src/main/escp2-papers.c:1163
+#: src/main/print-lexmark.c:877 src/main/escp2-papers.c:1168
+#: src/main/escp2-papers.c:1212 src/main/escp2-papers.c:1256
+#: src/main/escp2-papers.c:1304 src/main/escp2-papers.c:1352
+#: src/main/escp2-papers.c:1396
 msgid "Inkjet Paper"
 msgstr "噴墨專用紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:985
-#: src/main/escp2-papers.c:1029 src/main/escp2-papers.c:1073
-#: src/main/escp2-papers.c:1121 src/main/escp2-papers.c:1165
+#: src/main/print-lexmark.c:881 src/main/escp2-papers.c:1170
+#: src/main/escp2-papers.c:1214 src/main/escp2-papers.c:1258
+#: src/main/escp2-papers.c:1306 src/main/escp2-papers.c:1354
+#: src/main/escp2-papers.c:1398
 msgid "Photo Quality Inkjet Paper"
 msgstr "優質噴墨專用紙"
 
-#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:987
-#: src/main/escp2-papers.c:1031 src/main/escp2-papers.c:1075
-#: src/main/escp2-papers.c:1123 src/main/escp2-papers.c:1167
+#: src/main/print-lexmark.c:885 src/main/escp2-papers.c:1172
+#: src/main/escp2-papers.c:1216 src/main/escp2-papers.c:1260
+#: src/main/escp2-papers.c:1308 src/main/escp2-papers.c:1356
+#: src/main/escp2-papers.c:1400
 msgid "Photo Paper"
 msgstr "相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:989
-#: src/main/escp2-papers.c:1033 src/main/escp2-papers.c:1077
-#: src/main/escp2-papers.c:1125 src/main/escp2-papers.c:1169
+#: src/main/print-lexmark.c:889 src/main/escp2-papers.c:1174
+#: src/main/escp2-papers.c:1218 src/main/escp2-papers.c:1262
+#: src/main/escp2-papers.c:1310 src/main/escp2-papers.c:1358
+#: src/main/escp2-papers.c:1402
 msgid "Premium Glossy Photo Paper"
 msgstr "頂級光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:993
-#: src/main/escp2-papers.c:1037 src/main/escp2-papers.c:1081
-#: src/main/escp2-papers.c:1129 src/main/escp2-papers.c:1173
+#: src/main/print-lexmark.c:893 src/main/escp2-papers.c:1178
+#: src/main/escp2-papers.c:1222 src/main/escp2-papers.c:1266
+#: src/main/escp2-papers.c:1314 src/main/escp2-papers.c:1362
+#: src/main/escp2-papers.c:1406
 msgid "Premium Luster Photo Paper"
 msgstr "精�光�相紙"
 
 # (Abel) from Epson
-#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:995
-#: src/main/escp2-papers.c:1039 src/main/escp2-papers.c:1087
-#: src/main/escp2-papers.c:1131 src/main/escp2-papers.c:1179
+#: src/main/print-lexmark.c:897 src/main/escp2-papers.c:1180
+#: src/main/escp2-papers.c:1224 src/main/escp2-papers.c:1272
+#: src/main/escp2-papers.c:1320 src/main/escp2-papers.c:1364
+#: src/main/escp2-papers.c:1412
 msgid "Photo Quality Glossy Paper"
 msgstr "光�紙"
 
-#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:997
-#: src/main/escp2-papers.c:1041 src/main/escp2-papers.c:1089
-#: src/main/escp2-papers.c:1133 src/main/escp2-papers.c:1181
+#: src/main/print-lexmark.c:901 src/main/escp2-papers.c:1182
+#: src/main/escp2-papers.c:1226 src/main/escp2-papers.c:1274
+#: src/main/escp2-papers.c:1322 src/main/escp2-papers.c:1366
+#: src/main/escp2-papers.c:1414
 msgid "Ilford Heavy Paper"
 msgstr ""
 
-#: src/main/print-olympus.c:264
+#: src/main/print-olympus.c:265
 msgid "Coated"
 msgstr ""
 
-#: src/main/print-olympus.c:265 src/cups/genppd.c:1402 src/cups/genppd.c:1417
-#: src/cups/genppd.c:1465
+#: src/main/print-olympus.c:266 src/cups/genppd.c:1400 src/cups/genppd.c:1415
+#: src/cups/genppd.c:1463
 msgid "None"
 msgstr ""
 
-#: src/main/print-olympus.c:858
+#: src/main/print-olympus.c:859
 msgid "Glossy"
 msgstr "光�"
 
-#: src/main/print-olympus.c:859
+#: src/main/print-olympus.c:860
 msgid "Texture"
 msgstr ""
 
-#: src/main/print-olympus.c:860
+#: src/main/print-olympus.c:861
 msgid "Matte"
 msgstr ""
 
-#: src/main/print-olympus.c:1186 src/main/print-olympus.c:1187
+#: src/main/print-olympus.c:1295 src/main/print-olympus.c:1296
 msgid "Laminate Pattern"
 msgstr ""
 
-#: src/main/print-olympus.c:1222
+#: src/main/print-olympus.c:1331
 msgid "Adjust the cyan balance"
 msgstr "調整氰�色色彩平衡"
 
-#: src/main/print-olympus.c:1230
+#: src/main/print-olympus.c:1339
 msgid "Adjust the magenta balance"
 msgstr "調整洋紅色色彩平衡"
 
-#: src/main/print-olympus.c:1238
+#: src/main/print-olympus.c:1347
 msgid "Adjust the yellow balance"
 msgstr "調整黃色色彩平衡"
 
-#: src/main/print-olympus.c:1245
+#: src/main/print-olympus.c:1354
 msgid "Black Balance"
 msgstr "黑色平衡"
 
-#: src/main/print-olympus.c:1246
+#: src/main/print-olympus.c:1355
 msgid "Adjust the black balance"
 msgstr "調整黑色色彩平衡"
 
@@ -1764,14 +1823,6 @@ msgstr "600x600 DPI 單色"
 msgid "2400x600 DPI"
 msgstr "2400x600 DPI"
 
-#: src/main/print-pcl.c:1195
-msgid "Double-Sided Printing"
-msgstr "雙�列�"
-
-#: src/main/print-pcl.c:1196
-msgid "Duplex/Tumble Setting"
-msgstr ""
-
 #: src/main/print-pcl.c:1427
 msgid "Color + Black Cartridges"
 msgstr ""
@@ -1780,27 +1831,17 @@ msgstr ""
 msgid "Color + Photo Cartridges"
 msgstr ""
 
-#: src/main/print-pcl.c:1439 src/main/escp2-resolutions.c:438
-#: src/main/escp2-resolutions.c:446 src/main/escp2-resolutions.c:457
-#: src/main/escp2-resolutions.c:469
-msgid "Off"
-msgstr ""
-
 #: src/main/print-pcl.c:1440
 msgid "Long Edge (Standard)"
 msgstr ""
 
-#: src/main/print-pcl.c:1441
-msgid "Short Edge (Flip)"
-msgstr ""
-
 #: src/main/print-ps.c:96
 #, fuzzy
 msgid "PPDFile"
 msgstr "PPD 檔"
 
-#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1735
-#: src/gutenprintui2/panel.c:1734
+#: src/main/print-ps.c:97 src/gutenprintui/panel.c:1738
+#: src/gutenprintui2/panel.c:1737
 msgid "PPD File"
 msgstr "PPD 檔"
 
@@ -1808,148 +1849,163 @@ msgstr "PPD 檔"
 msgid "Image dimensions must match paper dimensions"
 msgstr ""
 
-#: src/main/escp2-channels.c:675 src/main/escp2-channels.c:688
+#: src/main/escp2-channels.c:744 src/main/escp2-channels.c:757
 msgid "Two Level Grayscale"
 msgstr ""
 
-#: src/main/escp2-channels.c:710 src/main/escp2-channels.c:723
-#: src/main/escp2-channels.c:736 src/main/escp2-channels.c:749
-#: src/main/escp2-channels.c:762 src/main/escp2-channels.c:1836
-#: src/main/escp2-channels.c:1859 src/main/escp2-channels.c:1879
-#: src/main/escp2-channels.c:1899 src/main/escp2-channels.c:1919
+#: src/main/escp2-channels.c:779 src/main/escp2-channels.c:792
+msgid "Three Level Grayscale"
+msgstr ""
+
+#: src/main/escp2-channels.c:814 src/main/escp2-channels.c:827
+#: src/main/escp2-channels.c:840 src/main/escp2-channels.c:853
+#: src/main/escp2-channels.c:866 src/main/escp2-channels.c:2072
+#: src/main/escp2-channels.c:2095 src/main/escp2-channels.c:2115
+#: src/main/escp2-channels.c:2135 src/main/escp2-channels.c:2155
 msgid "Quadtone"
 msgstr ""
 
-#: src/main/escp2-channels.c:1128 src/main/escp2-channels.c:1142
+#: src/main/escp2-channels.c:1286 src/main/escp2-channels.c:1300
 msgid "Six Color Enhanced Composite"
 msgstr ""
 
-#: src/main/escp2-channels.c:1165 src/main/escp2-channels.c:1179
-#: src/main/escp2-channels.c:1215
+#: src/main/escp2-channels.c:1323 src/main/escp2-channels.c:1337
+#: src/main/escp2-channels.c:1351 src/main/escp2-channels.c:1387
 msgid "Seven Color Photo"
 msgstr ""
 
-#: src/main/escp2-channels.c:1201
+#: src/main/escp2-channels.c:1373
 msgid "Seven Color Enhanced"
 msgstr ""
 
-#: src/main/escp2-channels.c:1348 src/main/escp2-channels.c:1354
+#: src/main/escp2-channels.c:1410
+msgid "Eight Color Photo"
+msgstr ""
+
+#: src/main/escp2-channels.c:1543 src/main/escp2-channels.c:1549
 msgid "One Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1360
+#: src/main/escp2-channels.c:1555
 msgid "One Color Raw Enhanced Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1373 src/main/escp2-channels.c:1385
+#: src/main/escp2-channels.c:1568 src/main/escp2-channels.c:1580
 msgid "Two Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1399 src/main/escp2-channels.c:1413
-#: src/main/escp2-channels.c:1440 src/main/escp2-channels.c:1453
-#: src/main/escp2-channels.c:1466 src/main/escp2-channels.c:1480
-#: src/main/escp2-channels.c:1494
+#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1608
+#: src/main/escp2-channels.c:1635 src/main/escp2-channels.c:1648
+#: src/main/escp2-channels.c:1661 src/main/escp2-channels.c:1675
+#: src/main/escp2-channels.c:1689
 msgid "Three Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1427
+#: src/main/escp2-channels.c:1622
 msgid "Three Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1501 src/main/escp2-channels.c:1507
-#: src/main/escp2-channels.c:1513 src/main/escp2-channels.c:1519
-#: src/main/escp2-channels.c:1525 src/main/escp2-channels.c:1531
-#: src/main/escp2-channels.c:1537 src/main/escp2-channels.c:1543
+#: src/main/escp2-channels.c:1696 src/main/escp2-channels.c:1702
+#: src/main/escp2-channels.c:1708 src/main/escp2-channels.c:1714
+#: src/main/escp2-channels.c:1720 src/main/escp2-channels.c:1726
+#: src/main/escp2-channels.c:1732 src/main/escp2-channels.c:1738
 msgid "Four Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1549
+#: src/main/escp2-channels.c:1744
 msgid "Four Color Raw Gloss"
 msgstr ""
 
-#: src/main/escp2-channels.c:1564 src/main/escp2-channels.c:1578
+#: src/main/escp2-channels.c:1759 src/main/escp2-channels.c:1773
 msgid "Five Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1594 src/main/escp2-channels.c:1600
-#: src/main/escp2-channels.c:1615
+#: src/main/escp2-channels.c:1789 src/main/escp2-channels.c:1795
+#: src/main/escp2-channels.c:1810
 msgid "Six Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1621
+#: src/main/escp2-channels.c:1816
 msgid "Six Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1636 src/main/escp2-channels.c:1651
-#: src/main/escp2-channels.c:1666
+#: src/main/escp2-channels.c:1831 src/main/escp2-channels.c:1846
+#: src/main/escp2-channels.c:1861
 msgid "Seven Color Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1683
+#: src/main/escp2-channels.c:1878
 msgid "Seven Color Enhanced Gloss Raw"
 msgstr ""
 
-#: src/main/escp2-channels.c:1815 src/main/escp2-channels.c:1828
-#: src/main/escp2-channels.c:1848 src/main/escp2-channels.c:1851
-#: src/main/escp2-channels.c:1871 src/main/escp2-channels.c:1891
-#: src/main/escp2-channels.c:1911 src/main/escp2-channels.c:1931
-#: src/main/escp2-channels.c:1947 src/main/escp2-channels.c:1949
-#: src/main/escp2-channels.c:1951 src/main/escp2-channels.c:1953
-#: src/main/escp2-channels.c:1969 src/main/escp2-channels.c:1989
+#: src/main/escp2-channels.c:1896
+msgid "Eight Color Raw"
+msgstr ""
+
+#: src/main/escp2-channels.c:2051 src/main/escp2-channels.c:2064
+#: src/main/escp2-channels.c:2084 src/main/escp2-channels.c:2087
+#: src/main/escp2-channels.c:2107 src/main/escp2-channels.c:2127
+#: src/main/escp2-channels.c:2147 src/main/escp2-channels.c:2167
+#: src/main/escp2-channels.c:2183 src/main/escp2-channels.c:2185
+#: src/main/escp2-channels.c:2187 src/main/escp2-channels.c:2189
+#: src/main/escp2-channels.c:2205 src/main/escp2-channels.c:2225
 msgid "EPSON Standard Inks"
 msgstr ""
 
-#: src/main/escp2-channels.c:2009 src/main/escp2-channels.c:2034
+#: src/main/escp2-channels.c:2245 src/main/escp2-channels.c:2270
 msgid "UltraChrome Photo Black"
 msgstr ""
 
-#: src/main/escp2-channels.c:2013 src/main/escp2-channels.c:2038
+#: src/main/escp2-channels.c:2249 src/main/escp2-channels.c:2274
 msgid "UltraChrome Matte Black"
 msgstr ""
 
-#: src/main/escp2-papers.c:967 src/main/escp2-papers.c:1011
-#: src/main/escp2-papers.c:1055 src/main/escp2-papers.c:1103
-#: src/main/escp2-papers.c:1147
+#: src/main/escp2-papers.c:1152 src/main/escp2-papers.c:1196
+#: src/main/escp2-papers.c:1240 src/main/escp2-papers.c:1288
+#: src/main/escp2-papers.c:1336 src/main/escp2-papers.c:1380
 msgid "Plain Paper Fast Load"
 msgstr ""
 
-#: src/main/escp2-papers.c:969 src/main/escp2-papers.c:1013
-#: src/main/escp2-papers.c:1057 src/main/escp2-papers.c:1105
-#: src/main/escp2-papers.c:1149 src/main/xmli18n-tmp.h:5
+#: src/main/escp2-papers.c:1154 src/main/escp2-papers.c:1198
+#: src/main/escp2-papers.c:1242 src/main/escp2-papers.c:1290
+#: src/main/escp2-papers.c:1338 src/main/escp2-papers.c:1382
+#: src/main/xmli18n-tmp.h:5
 msgid "Postcard"
 msgstr "明信片"
 
-#: src/main/escp2-papers.c:977 src/main/escp2-papers.c:1021
-#: src/main/escp2-papers.c:1065 src/main/escp2-papers.c:1113
-#: src/main/escp2-papers.c:1157
+#: src/main/escp2-papers.c:1162 src/main/escp2-papers.c:1206
+#: src/main/escp2-papers.c:1250 src/main/escp2-papers.c:1298
+#: src/main/escp2-papers.c:1346 src/main/escp2-papers.c:1390
 msgid "Back Light Film"
 msgstr ""
 
-#: src/main/escp2-papers.c:981 src/main/escp2-papers.c:1025
-#: src/main/escp2-papers.c:1069 src/main/escp2-papers.c:1117
-#: src/main/escp2-papers.c:1161
+#: src/main/escp2-papers.c:1166 src/main/escp2-papers.c:1210
+#: src/main/escp2-papers.c:1254 src/main/escp2-papers.c:1302
+#: src/main/escp2-papers.c:1350 src/main/escp2-papers.c:1394
 msgid "Matte Paper Heavyweight"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/escp2-papers.c:991 src/main/escp2-papers.c:1035
-#: src/main/escp2-papers.c:1079 src/main/escp2-papers.c:1127
-#: src/main/escp2-papers.c:1171
+#: src/main/escp2-papers.c:1176 src/main/escp2-papers.c:1220
+#: src/main/escp2-papers.c:1264 src/main/escp2-papers.c:1312
+#: src/main/escp2-papers.c:1360 src/main/escp2-papers.c:1404
 msgid "Premium Semigloss Photo Paper"
 msgstr "頂級柔光相紙"
 
-#: src/main/escp2-papers.c:999 src/main/escp2-papers.c:1043
-#: src/main/escp2-papers.c:1091 src/main/escp2-papers.c:1135
-#: src/main/escp2-papers.c:1183
+#: src/main/escp2-papers.c:1184 src/main/escp2-papers.c:1228
+#: src/main/escp2-papers.c:1276 src/main/escp2-papers.c:1324
+#: src/main/escp2-papers.c:1368 src/main/escp2-papers.c:1416
 msgid "ColorLife Paper"
 msgstr ""
 
-#: src/main/escp2-papers.c:1083 src/main/escp2-papers.c:1175
+#: src/main/escp2-papers.c:1268 src/main/escp2-papers.c:1316
+#: src/main/escp2-papers.c:1408
 msgid "Archival Matte Paper"
 msgstr ""
 
 # (Abel) from Epson
-#: src/main/escp2-papers.c:1085 src/main/escp2-papers.c:1177
+#: src/main/escp2-papers.c:1270 src/main/escp2-papers.c:1318
+#: src/main/escp2-papers.c:1410
 msgid "Watercolor Paper - Radiant White"
 msgstr "水彩紙-亮白色"
 
@@ -2006,61 +2062,71 @@ msgstr "1440 x 720 DPI"
 msgid "1440 x 720 DPI Highest Quality"
 msgstr "1440 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:111 src/main/escp2-resolutions.c:114
+#: src/main/escp2-resolutions.c:110
+#, fuzzy
+msgid "1440 x 720 DPI Transposed"
+msgstr "1440 x 720 DPI"
+
+#: src/main/escp2-resolutions.c:114 src/main/escp2-resolutions.c:117
 msgid "2880 x 720 DPI"
 msgstr "2880 x 720 DPI"
 
-#: src/main/escp2-resolutions.c:117
+#: src/main/escp2-resolutions.c:120
 msgid "2880 x 720 DPI Highest Quality"
 msgstr "2880 x 720 DPI 最高�質"
 
-#: src/main/escp2-resolutions.c:121 src/main/escp2-resolutions.c:124
-#: src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:124 src/main/escp2-resolutions.c:127
+#: src/main/escp2-resolutions.c:130
 msgid "1440 x 1440 DPI"
 msgstr "1440 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:131 src/main/escp2-resolutions.c:134
+#: src/main/escp2-resolutions.c:134 src/main/escp2-resolutions.c:137
 msgid "2880 x 1440 DPI"
 msgstr "2880 x 1440 DPI"
 
-#: src/main/escp2-resolutions.c:138 src/main/escp2-resolutions.c:141
+#: src/main/escp2-resolutions.c:140
+#, fuzzy
+msgid "2880 x 1440 DPI Transposed"
+msgstr "2880 x 1440 DPI"
+
+#: src/main/escp2-resolutions.c:144 src/main/escp2-resolutions.c:147
 msgid "2880 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:145 src/main/escp2-resolutions.c:148
+#: src/main/escp2-resolutions.c:151 src/main/escp2-resolutions.c:154
 #, fuzzy
 msgid "5760 x 2880 DPI"
 msgstr "2880 x 2880 DPI"
 
-#: src/main/escp2-resolutions.c:439
+#: src/main/escp2-resolutions.c:449
 msgid "On"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:447 src/main/escp2-resolutions.c:458
-#: src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:457 src/main/escp2-resolutions.c:468
+#: src/main/escp2-resolutions.c:480
 msgid "Interleave"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:448 src/main/escp2-resolutions.c:459
-#: src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:458 src/main/escp2-resolutions.c:469
+#: src/main/escp2-resolutions.c:481
 msgid "Full Overlap"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:449 src/main/escp2-resolutions.c:460
-#: src/main/escp2-resolutions.c:472
+#: src/main/escp2-resolutions.c:459 src/main/escp2-resolutions.c:470
+#: src/main/escp2-resolutions.c:482
 msgid "Four Pass"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:450 src/main/escp2-resolutions.c:461
-#: src/main/escp2-resolutions.c:473
+#: src/main/escp2-resolutions.c:460 src/main/escp2-resolutions.c:471
+#: src/main/escp2-resolutions.c:483
 msgid "Full Overlap 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:462 src/main/escp2-resolutions.c:474
+#: src/main/escp2-resolutions.c:472 src/main/escp2-resolutions.c:484
 msgid "Interleave 2"
 msgstr ""
 
-#: src/main/escp2-resolutions.c:475
+#: src/main/escp2-resolutions.c:485
 msgid "Eight Pass"
 msgstr ""
 
@@ -2750,1164 +2816,1319 @@ msgid "Canon BJC 8200"
 msgstr "Canon BJC 8200"
 
 #: src/main/xmli18n-tmp.h:163
-msgid "Canon S400"
+#, fuzzy
+msgid "Canon S200"
 msgstr "Canon S400"
 
 #: src/main/xmli18n-tmp.h:164
+msgid "Canon S400"
+msgstr "Canon S400"
+
+#: src/main/xmli18n-tmp.h:165
 msgid "Canon S450"
 msgstr "Canon S450"
 
-#: src/main/xmli18n-tmp.h:165
+#: src/main/xmli18n-tmp.h:166
 msgid "Canon S800"
 msgstr "Canon S800"
 
-#: src/main/xmli18n-tmp.h:166
+#: src/main/xmli18n-tmp.h:167
 msgid "Canon S4500"
 msgstr "Canon S4500"
 
-#: src/main/xmli18n-tmp.h:167
+#: src/main/xmli18n-tmp.h:168
 #, fuzzy
 msgid "Canon PIXMA iP4000"
 msgstr "Canon S400"
 
-#: src/main/xmli18n-tmp.h:168
+#: src/main/xmli18n-tmp.h:169
+#, fuzzy
+msgid "EPSON Stylus C20"
+msgstr "EPSON Stylus C20SX"
+
+#: src/main/xmli18n-tmp.h:170
 msgid "EPSON Stylus C20SX"
 msgstr "EPSON Stylus C20SX"
 
-#: src/main/xmli18n-tmp.h:169
+#: src/main/xmli18n-tmp.h:171
 msgid "EPSON Stylus C20UX"
 msgstr "EPSON Stylus C20UX"
 
-#: src/main/xmli18n-tmp.h:170
+#: src/main/xmli18n-tmp.h:172
+#, fuzzy
+msgid "EPSON Stylus C40"
+msgstr "EPSON Stylus C40SX"
+
+#: src/main/xmli18n-tmp.h:173
 msgid "EPSON Stylus C40SX"
 msgstr "EPSON Stylus C40SX"
 
-#: src/main/xmli18n-tmp.h:171
+#: src/main/xmli18n-tmp.h:174
 msgid "EPSON Stylus C40UX"
 msgstr "EPSON Stylus C40UX"
 
-#: src/main/xmli18n-tmp.h:172
+#: src/main/xmli18n-tmp.h:175
+#, fuzzy
+msgid "EPSON Stylus C41"
+msgstr "EPSON Stylus C41SX"
+
+#: src/main/xmli18n-tmp.h:176
 msgid "EPSON Stylus C41SX"
 msgstr "EPSON Stylus C41SX"
 
-#: src/main/xmli18n-tmp.h:173
+#: src/main/xmli18n-tmp.h:177
 msgid "EPSON Stylus C41UX"
 msgstr "EPSON Stylus C41UX"
 
-#: src/main/xmli18n-tmp.h:174
+#: src/main/xmli18n-tmp.h:178
+#, fuzzy
+msgid "EPSON Stylus C42"
+msgstr "EPSON Stylus C42SX"
+
+#: src/main/xmli18n-tmp.h:179
 msgid "EPSON Stylus C42SX"
 msgstr "EPSON Stylus C42SX"
 
-#: src/main/xmli18n-tmp.h:175
+#: src/main/xmli18n-tmp.h:180
 msgid "EPSON Stylus C42UX"
 msgstr "EPSON Stylus C42UX"
 
-#: src/main/xmli18n-tmp.h:176
+#: src/main/xmli18n-tmp.h:181
+#, fuzzy
+msgid "EPSON Stylus C43"
+msgstr "EPSON Stylus C43SX"
+
+#: src/main/xmli18n-tmp.h:182
 msgid "EPSON Stylus C43SX"
 msgstr "EPSON Stylus C43SX"
 
-#: src/main/xmli18n-tmp.h:177
+#: src/main/xmli18n-tmp.h:183
 msgid "EPSON Stylus C43UX"
 msgstr "EPSON Stylus C43UX"
 
-#: src/main/xmli18n-tmp.h:178
+#: src/main/xmli18n-tmp.h:184
+#, fuzzy
+msgid "EPSON Stylus C44"
+msgstr "EPSON Stylus C44SX"
+
+#: src/main/xmli18n-tmp.h:185
 msgid "EPSON Stylus C44SX"
 msgstr "EPSON Stylus C44SX"
 
-#: src/main/xmli18n-tmp.h:179
+#: src/main/xmli18n-tmp.h:186
 msgid "EPSON Stylus C44UX"
 msgstr "EPSON Stylus C44UX"
 
-#: src/main/xmli18n-tmp.h:180
+#: src/main/xmli18n-tmp.h:187
 msgid "EPSON Stylus C45"
 msgstr "EPSON Stylus C45"
 
-#: src/main/xmli18n-tmp.h:181
+#: src/main/xmli18n-tmp.h:188
 msgid "EPSON Stylus C46"
 msgstr "EPSON Stylus C46"
 
-#: src/main/xmli18n-tmp.h:182
+#: src/main/xmli18n-tmp.h:189
+#, fuzzy
+msgid "EPSON Stylus C48"
+msgstr "EPSON Stylus C45"
+
+#: src/main/xmli18n-tmp.h:190
 msgid "EPSON Stylus C50"
 msgstr "EPSON Stylus C50"
 
-#: src/main/xmli18n-tmp.h:183
+#: src/main/xmli18n-tmp.h:191
 msgid "EPSON Stylus C60"
 msgstr "EPSON Stylus C60"
 
-#: src/main/xmli18n-tmp.h:184
+#: src/main/xmli18n-tmp.h:192
 msgid "EPSON Stylus C61"
 msgstr "EPSON Stylus C61"
 
-#: src/main/xmli18n-tmp.h:185
+#: src/main/xmli18n-tmp.h:193
 msgid "EPSON Stylus C62"
 msgstr "EPSON Stylus C62"
 
-#: src/main/xmli18n-tmp.h:186
+#: src/main/xmli18n-tmp.h:194
 msgid "EPSON Stylus C63"
 msgstr "EPSON Stylus C63"
 
-#: src/main/xmli18n-tmp.h:187
+#: src/main/xmli18n-tmp.h:195
 msgid "EPSON Stylus C64"
 msgstr "EPSON Stylus C64"
 
-#: src/main/xmli18n-tmp.h:188
+#: src/main/xmli18n-tmp.h:196
 msgid "EPSON Stylus C65"
 msgstr "EPSON Stylus C65"
 
-#: src/main/xmli18n-tmp.h:189
+#: src/main/xmli18n-tmp.h:197
 msgid "EPSON Stylus C66"
 msgstr "EPSON Stylus C66"
 
-#: src/main/xmli18n-tmp.h:190
+#: src/main/xmli18n-tmp.h:198
+#, fuzzy
+msgid "EPSON Stylus C68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:199
 msgid "EPSON Stylus C70"
 msgstr "EPSON Stylus C70"
 
-#: src/main/xmli18n-tmp.h:191
+#: src/main/xmli18n-tmp.h:200
 msgid "EPSON Stylus C80"
 msgstr "EPSON Stylus C80"
 
-#: src/main/xmli18n-tmp.h:192
+#: src/main/xmli18n-tmp.h:201
 msgid "EPSON Stylus C82"
 msgstr "EPSON Stylus C82"
 
-#: src/main/xmli18n-tmp.h:193
+#: src/main/xmli18n-tmp.h:202
 msgid "EPSON Stylus C83"
 msgstr "EPSON Stylus C83"
 
-#: src/main/xmli18n-tmp.h:194
+#: src/main/xmli18n-tmp.h:203
 msgid "EPSON Stylus C84"
 msgstr "EPSON Stylus C84"
 
-#: src/main/xmli18n-tmp.h:195
+#: src/main/xmli18n-tmp.h:204
 msgid "EPSON Stylus C85"
 msgstr "EPSON Stylus C85"
 
-#: src/main/xmli18n-tmp.h:196
+#: src/main/xmli18n-tmp.h:205
 msgid "EPSON Stylus C86"
 msgstr "EPSON Stylus C86"
 
-#: src/main/xmli18n-tmp.h:197
+#: src/main/xmli18n-tmp.h:206
+#, fuzzy
+msgid "EPSON Stylus C88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:207
 msgid "EPSON Stylus Color"
 msgstr "EPSON Stylus Color"
 
-#: src/main/xmli18n-tmp.h:198
+#: src/main/xmli18n-tmp.h:208
 msgid "EPSON Stylus Color Pro"
 msgstr "EPSON Stylus Color Pro"
 
-#: src/main/xmli18n-tmp.h:199
+#: src/main/xmli18n-tmp.h:209
 msgid "EPSON Stylus Color Pro XL"
 msgstr "EPSON Stylus Color Pro XL"
 
-#: src/main/xmli18n-tmp.h:200
+#: src/main/xmli18n-tmp.h:210
 msgid "EPSON Stylus Color 400"
 msgstr "EPSON Stylus Color 400"
 
-#: src/main/xmli18n-tmp.h:201
+#: src/main/xmli18n-tmp.h:211
 msgid "EPSON Stylus Color 440"
 msgstr "EPSON Stylus Color 440"
 
-#: src/main/xmli18n-tmp.h:202
+#: src/main/xmli18n-tmp.h:212
 msgid "EPSON Stylus Color 460"
 msgstr "EPSON Stylus Color 460"
 
-#: src/main/xmli18n-tmp.h:203
+#: src/main/xmli18n-tmp.h:213
 msgid "EPSON Stylus Color 480"
 msgstr "EPSON Stylus Color 480"
 
-#: src/main/xmli18n-tmp.h:204
+#: src/main/xmli18n-tmp.h:214
 msgid "EPSON Stylus Color 500"
 msgstr "EPSON Stylus Color 500"
 
-#: src/main/xmli18n-tmp.h:205
+#: src/main/xmli18n-tmp.h:215
 msgid "EPSON Stylus Color 580"
 msgstr "EPSON Stylus Color 580"
 
-#: src/main/xmli18n-tmp.h:206
+#: src/main/xmli18n-tmp.h:216
 msgid "EPSON Stylus Color 600"
 msgstr "EPSON Stylus Color 600"
 
-#: src/main/xmli18n-tmp.h:207
+#: src/main/xmli18n-tmp.h:217
 msgid "EPSON Stylus Color 640"
 msgstr "EPSON Stylus Color 640"
 
-#: src/main/xmli18n-tmp.h:208
+#: src/main/xmli18n-tmp.h:218
 msgid "EPSON Stylus Color 660"
 msgstr "EPSON Stylus Color 660"
 
-#: src/main/xmli18n-tmp.h:209
+#: src/main/xmli18n-tmp.h:219
 msgid "EPSON Stylus Color 670"
 msgstr "EPSON Stylus Color 670"
 
-#: src/main/xmli18n-tmp.h:210
+#: src/main/xmli18n-tmp.h:220
 msgid "EPSON Stylus Color 680"
 msgstr "EPSON Stylus Color 680"
 
-#: src/main/xmli18n-tmp.h:211
+#: src/main/xmli18n-tmp.h:221
 msgid "EPSON Stylus Color 740"
 msgstr "EPSON Stylus Color 740"
 
-#: src/main/xmli18n-tmp.h:212
+#: src/main/xmli18n-tmp.h:222
 msgid "EPSON Stylus Color 760"
 msgstr "EPSON Stylus Color 760"
 
-#: src/main/xmli18n-tmp.h:213
+#: src/main/xmli18n-tmp.h:223
 msgid "EPSON Stylus Color 777"
 msgstr "EPSON Stylus Color 777"
 
-#: src/main/xmli18n-tmp.h:214
+#: src/main/xmli18n-tmp.h:224
 msgid "EPSON Stylus Color 800"
 msgstr "EPSON Stylus Color 800"
 
-#: src/main/xmli18n-tmp.h:215
+#: src/main/xmli18n-tmp.h:225
 msgid "EPSON Stylus Color 850"
 msgstr "EPSON Stylus Color 850"
 
-#: src/main/xmli18n-tmp.h:216
+#: src/main/xmli18n-tmp.h:226
 msgid "EPSON Stylus Color 860"
 msgstr "EPSON Stylus Color 860"
 
-#: src/main/xmli18n-tmp.h:217
+#: src/main/xmli18n-tmp.h:227
 msgid "EPSON Stylus Color 880"
 msgstr "EPSON Stylus Color 880"
 
-#: src/main/xmli18n-tmp.h:218
+#: src/main/xmli18n-tmp.h:228
 msgid "EPSON Stylus Color 83"
 msgstr "EPSON Stylus Color 83"
 
-#: src/main/xmli18n-tmp.h:219
+#: src/main/xmli18n-tmp.h:229
 msgid "EPSON Stylus Color 900"
 msgstr "EPSON Stylus Color 900"
 
-#: src/main/xmli18n-tmp.h:220
+#: src/main/xmli18n-tmp.h:230
 msgid "EPSON Stylus Color 980"
 msgstr "EPSON Stylus Color 980"
 
-#: src/main/xmli18n-tmp.h:221
+#: src/main/xmli18n-tmp.h:231
 msgid "EPSON Stylus Color 1160"
 msgstr "EPSON Stylus Color 1160"
 
-#: src/main/xmli18n-tmp.h:222
+#: src/main/xmli18n-tmp.h:232
 msgid "EPSON Stylus Color 1500"
 msgstr "EPSON Stylus Color 1500"
 
-#: src/main/xmli18n-tmp.h:223
+#: src/main/xmli18n-tmp.h:233
 msgid "EPSON Stylus Color 1520"
 msgstr "EPSON Stylus Color 1520"
 
-#: src/main/xmli18n-tmp.h:224
+#: src/main/xmli18n-tmp.h:234
 msgid "EPSON Stylus Color 3000"
 msgstr "EPSON Stylus Color 3000"
 
-#: src/main/xmli18n-tmp.h:225
+#: src/main/xmli18n-tmp.h:235
 msgid "EPSON Stylus Photo"
 msgstr "EPSON Stylus Photo"
 
-#: src/main/xmli18n-tmp.h:226
+#: src/main/xmli18n-tmp.h:236
 msgid "EPSON Stylus Photo 700"
 msgstr "EPSON Stylus Photo 700"
 
-#: src/main/xmli18n-tmp.h:227
+#: src/main/xmli18n-tmp.h:237
 msgid "EPSON Stylus Photo EX"
 msgstr "EPSON Stylus Photo EX"
 
-#: src/main/xmli18n-tmp.h:228
+#: src/main/xmli18n-tmp.h:238
 msgid "EPSON Stylus Photo EX3"
 msgstr "EPSON Stylus Photo EX3"
 
-#: src/main/xmli18n-tmp.h:229
+#: src/main/xmli18n-tmp.h:239
 msgid "EPSON Stylus Photo 720"
 msgstr "EPSON Stylus Photo 720"
 
-#: src/main/xmli18n-tmp.h:230
+#: src/main/xmli18n-tmp.h:240
 msgid "EPSON Stylus Photo 750"
 msgstr "EPSON Stylus Photo 750"
 
-#: src/main/xmli18n-tmp.h:231
+#: src/main/xmli18n-tmp.h:241
 msgid "EPSON Stylus Photo 780"
 msgstr "EPSON Stylus Photo 780"
 
-#: src/main/xmli18n-tmp.h:232
+#: src/main/xmli18n-tmp.h:242
 msgid "EPSON Stylus Photo 785EPX"
 msgstr "EPSON Stylus Photo 785EPX"
 
-#: src/main/xmli18n-tmp.h:233
+#: src/main/xmli18n-tmp.h:243
 msgid "EPSON Stylus Photo 790"
 msgstr "EPSON Stylus Photo 790"
 
-#: src/main/xmli18n-tmp.h:234
+#: src/main/xmli18n-tmp.h:244
 msgid "EPSON Stylus Photo 810"
 msgstr "EPSON Stylus Photo 810"
 
-#: src/main/xmli18n-tmp.h:235
+#: src/main/xmli18n-tmp.h:245
 msgid "EPSON Stylus Photo 820"
 msgstr "EPSON Stylus Photo 820"
 
-#: src/main/xmli18n-tmp.h:236
+#: src/main/xmli18n-tmp.h:246
 msgid "EPSON Stylus Photo 825"
 msgstr "EPSON Stylus Photo 825"
 
-#: src/main/xmli18n-tmp.h:237
+#: src/main/xmli18n-tmp.h:247
 msgid "EPSON Stylus Photo 830"
 msgstr "EPSON Stylus Photo 830"
 
-#: src/main/xmli18n-tmp.h:238
+#: src/main/xmli18n-tmp.h:248
 msgid "EPSON Stylus Photo 870"
 msgstr "EPSON Stylus Photo 870"
 
-#: src/main/xmli18n-tmp.h:239
+#: src/main/xmli18n-tmp.h:249
 msgid "EPSON Stylus Photo 875"
 msgstr "EPSON Stylus Photo 875"
 
-#: src/main/xmli18n-tmp.h:240
+#: src/main/xmli18n-tmp.h:250
 msgid "EPSON Stylus Photo 890"
 msgstr "EPSON Stylus Photo 890"
 
-#: src/main/xmli18n-tmp.h:241
+#: src/main/xmli18n-tmp.h:251
 msgid "EPSON Stylus Photo 895"
 msgstr "EPSON Stylus Photo 895"
 
-#: src/main/xmli18n-tmp.h:242
+#: src/main/xmli18n-tmp.h:252
 msgid "EPSON Stylus Photo 900"
 msgstr "EPSON Stylus Photo 900"
 
-#: src/main/xmli18n-tmp.h:243
+#: src/main/xmli18n-tmp.h:253
 msgid "EPSON Stylus Photo 915"
 msgstr "EPSON Stylus Photo 915"
 
-#: src/main/xmli18n-tmp.h:244
+#: src/main/xmli18n-tmp.h:254
 msgid "EPSON Stylus Photo 925"
 msgstr "EPSON Stylus Photo 925"
 
-#: src/main/xmli18n-tmp.h:245
+#: src/main/xmli18n-tmp.h:255
 msgid "EPSON Stylus Photo 935"
 msgstr "EPSON Stylus Photo 935"
 
-#: src/main/xmli18n-tmp.h:246
+#: src/main/xmli18n-tmp.h:256
 msgid "EPSON Stylus Photo 950"
 msgstr "EPSON Stylus Photo 950"
 
-#: src/main/xmli18n-tmp.h:247
+#: src/main/xmli18n-tmp.h:257
 msgid "EPSON Stylus Photo 960"
 msgstr "EPSON Stylus Photo 960"
 
-#: src/main/xmli18n-tmp.h:248
+#: src/main/xmli18n-tmp.h:258
 msgid "EPSON Stylus Photo 1200"
 msgstr "EPSON Stylus Photo 1200"
 
-#: src/main/xmli18n-tmp.h:249
+#: src/main/xmli18n-tmp.h:259
 msgid "EPSON Stylus Photo 1270"
 msgstr "EPSON Stylus Photo 1270"
 
-#: src/main/xmli18n-tmp.h:250
+#: src/main/xmli18n-tmp.h:260
 msgid "EPSON Stylus Photo 1280"
 msgstr "EPSON Stylus Photo 1280"
 
-#: src/main/xmli18n-tmp.h:251
+#: src/main/xmli18n-tmp.h:261
 msgid "EPSON Stylus Photo 1290"
 msgstr "EPSON Stylus Photo 1290"
 
-#: src/main/xmli18n-tmp.h:252
+#: src/main/xmli18n-tmp.h:262
 msgid "EPSON Stylus Photo 2000P"
 msgstr "EPSON Stylus Photo 2000P"
 
-#: src/main/xmli18n-tmp.h:253
+#: src/main/xmli18n-tmp.h:263
 msgid "EPSON Stylus Photo 2100"
 msgstr "EPSON Stylus Photo 2100"
 
-#: src/main/xmli18n-tmp.h:254
+#: src/main/xmli18n-tmp.h:264
 msgid "EPSON Stylus Photo 2200"
 msgstr "EPSON Stylus Photo 2200"
 
-#: src/main/xmli18n-tmp.h:255
+#: src/main/xmli18n-tmp.h:265
 msgid "EPSON Stylus Photo R200"
 msgstr "EPSON Stylus Photo R200"
 
-#: src/main/xmli18n-tmp.h:256
+#: src/main/xmli18n-tmp.h:266
 msgid "EPSON Stylus Photo R210"
 msgstr "EPSON Stylus Photo R210"
 
-#: src/main/xmli18n-tmp.h:257
+#: src/main/xmli18n-tmp.h:267
+#, fuzzy
+msgid "EPSON Stylus Photo R220"
+msgstr "EPSON Stylus Photo 2200"
+
+#: src/main/xmli18n-tmp.h:268
 msgid "EPSON Stylus Photo R300"
 msgstr "EPSON Stylus Photo R300"
 
-#: src/main/xmli18n-tmp.h:258
+#: src/main/xmli18n-tmp.h:269
 msgid "EPSON Stylus Photo R310"
 msgstr "EPSON Stylus Photo R310"
 
-#: src/main/xmli18n-tmp.h:259
+#: src/main/xmli18n-tmp.h:270
+#, fuzzy
+msgid "EPSON Stylus Photo R320"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:271
+#, fuzzy
+msgid "EPSON Stylus Photo R340"
+msgstr "EPSON Stylus Photo R300"
+
+#: src/main/xmli18n-tmp.h:272
 msgid "EPSON Stylus Photo RX400"
 msgstr "EPSON Stylus Photo RX400"
 
-#: src/main/xmli18n-tmp.h:260
+#: src/main/xmli18n-tmp.h:273
 msgid "EPSON Stylus Photo RX420"
 msgstr "EPSON Stylus Photo RX420"
 
-#: src/main/xmli18n-tmp.h:261
+#: src/main/xmli18n-tmp.h:274
 msgid "EPSON Stylus Photo RX425"
 msgstr "EPSON Stylus Photo RX425"
 
-#: src/main/xmli18n-tmp.h:262
+#: src/main/xmli18n-tmp.h:275
 msgid "EPSON Stylus Photo RX430"
 msgstr "EPSON Stylus Photo RX430"
 
-#: src/main/xmli18n-tmp.h:263
+#: src/main/xmli18n-tmp.h:276
 msgid "EPSON Stylus Photo RX500"
 msgstr "EPSON Stylus Photo RX500"
 
-#: src/main/xmli18n-tmp.h:264
+#: src/main/xmli18n-tmp.h:277
 msgid "EPSON Stylus Photo RX510"
 msgstr "EPSON Stylus Photo RX510"
 
-#: src/main/xmli18n-tmp.h:265
+#: src/main/xmli18n-tmp.h:278
 msgid "EPSON Stylus Photo RX600"
 msgstr "EPSON Stylus Photo RX600"
 
-#: src/main/xmli18n-tmp.h:266
+#: src/main/xmli18n-tmp.h:279
 msgid "EPSON Stylus Photo RX620"
 msgstr "EPSON Stylus Photo RX620"
 
-#: src/main/xmli18n-tmp.h:267
+#: src/main/xmli18n-tmp.h:280
 msgid "EPSON Stylus Photo RX630"
 msgstr "EPSON Stylus Photo RX630"
 
-#: src/main/xmli18n-tmp.h:268
+#: src/main/xmli18n-tmp.h:281
+#, fuzzy
+msgid "EPSON Stylus Photo RX700"
+msgstr "EPSON Stylus Photo RX400"
+
+#: src/main/xmli18n-tmp.h:282
 msgid "EPSON Stylus Photo R800"
 msgstr "EPSON Stylus Photo R800"
 
-#: src/main/xmli18n-tmp.h:269
+#: src/main/xmli18n-tmp.h:283
 msgid "EPSON Stylus Photo R1800"
 msgstr "EPSON Stylus Photo R1800"
 
-#: src/main/xmli18n-tmp.h:270
+#: src/main/xmli18n-tmp.h:284
+#, fuzzy
+msgid "EPSON Stylus Photo R2400"
+msgstr "EPSON Stylus Photo R200"
+
+#: src/main/xmli18n-tmp.h:285
 msgid "EPSON Stylus Pro 5000"
 msgstr "EPSON Stylus Pro 5000"
 
-#: src/main/xmli18n-tmp.h:271
+#: src/main/xmli18n-tmp.h:286
 msgid "EPSON Stylus Pro 5500"
 msgstr "EPSON Stylus Pro 5500"
 
-#: src/main/xmli18n-tmp.h:272
+#: src/main/xmli18n-tmp.h:287
 msgid "EPSON Stylus Pro 7000"
 msgstr "EPSON Stylus Pro 7000"
 
-#: src/main/xmli18n-tmp.h:273
+#: src/main/xmli18n-tmp.h:288
 msgid "EPSON Stylus Pro 7500"
 msgstr "EPSON Stylus Pro 7500"
 
-#: src/main/xmli18n-tmp.h:274
+#: src/main/xmli18n-tmp.h:289
 msgid "EPSON Stylus Pro 7600"
 msgstr "EPSON Stylus Pro 7600"
 
-#: src/main/xmli18n-tmp.h:275
+#: src/main/xmli18n-tmp.h:290
 msgid "EPSON Stylus Pro 9000"
 msgstr "EPSON Stylus Pro 9000"
 
-#: src/main/xmli18n-tmp.h:276
+#: src/main/xmli18n-tmp.h:291
 msgid "EPSON Stylus Pro 9500"
 msgstr "EPSON Stylus Pro 9500"
 
-#: src/main/xmli18n-tmp.h:277
+#: src/main/xmli18n-tmp.h:292
 msgid "EPSON Stylus Pro 9600"
 msgstr "EPSON Stylus Pro 9600"
 
-#: src/main/xmli18n-tmp.h:278
+#: src/main/xmli18n-tmp.h:293
 msgid "EPSON Stylus Pro 10000"
 msgstr "EPSON Stylus Pro 10000"
 
-#: src/main/xmli18n-tmp.h:279
+#: src/main/xmli18n-tmp.h:294
 msgid "EPSON Stylus Scan 2000"
 msgstr "EPSON Stylus Scan 2000"
 
-#: src/main/xmli18n-tmp.h:280
+#: src/main/xmli18n-tmp.h:295
 msgid "EPSON Stylus Scan 2500"
 msgstr "EPSON Stylus Scan 2500"
 
-#: src/main/xmli18n-tmp.h:281
+#: src/main/xmli18n-tmp.h:296
 msgid "EPSON Stylus CX1500"
 msgstr "EPSON Stylus CX1500"
 
-#: src/main/xmli18n-tmp.h:282
+#: src/main/xmli18n-tmp.h:297
 msgid "EPSON Stylus CX3100"
 msgstr "EPSON Stylus CX3100"
 
-#: src/main/xmli18n-tmp.h:283
+#: src/main/xmli18n-tmp.h:298
 msgid "EPSON Stylus CX3200"
 msgstr "EPSON Stylus CX3200"
 
-#: src/main/xmli18n-tmp.h:284
+#: src/main/xmli18n-tmp.h:299
 msgid "EPSON Stylus CX3500"
 msgstr "EPSON Stylus CX3500"
 
-#: src/main/xmli18n-tmp.h:285
+#: src/main/xmli18n-tmp.h:300
 msgid "EPSON Stylus CX3600"
 msgstr "EPSON Stylus CX3600"
 
-#: src/main/xmli18n-tmp.h:286
+#: src/main/xmli18n-tmp.h:301
 msgid "EPSON Stylus CX3650"
 msgstr "EPSON Stylus CX3650"
 
-#: src/main/xmli18n-tmp.h:287
+#: src/main/xmli18n-tmp.h:302
+#, fuzzy
+msgid "EPSON Stylus CX3700"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:303
+#, fuzzy
+msgid "EPSON Stylus CX3800"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:304
+#, fuzzy
+msgid "EPSON Stylus CX3810"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:305
+#, fuzzy
+msgid "EPSON Stylus CX4200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:306
 msgid "EPSON Stylus CX4600"
 msgstr "EPSON Stylus CX4600"
 
-#: src/main/xmli18n-tmp.h:288
+#: src/main/xmli18n-tmp.h:307
+#, fuzzy
+msgid "EPSON Stylus CX4700"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:308
+#, fuzzy
+msgid "EPSON Stylus CX4800"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:309
 msgid "EPSON Stylus CX5100"
 msgstr "EPSON Stylus CX5100"
 
-#: src/main/xmli18n-tmp.h:289
+#: src/main/xmli18n-tmp.h:310
 msgid "EPSON Stylus CX5200"
 msgstr "EPSON Stylus CX5200"
 
-#: src/main/xmli18n-tmp.h:290
+#: src/main/xmli18n-tmp.h:311
 msgid "EPSON Stylus CX5300"
 msgstr "EPSON Stylus CX5300"
 
-#: src/main/xmli18n-tmp.h:291
+#: src/main/xmli18n-tmp.h:312
 msgid "EPSON Stylus CX5400"
 msgstr "EPSON Stylus CX5400"
 
-#: src/main/xmli18n-tmp.h:292
+#: src/main/xmli18n-tmp.h:313
+#, fuzzy
+msgid "EPSON Stylus CX5800"
+msgstr "EPSON Stylus CX1500"
+
+#: src/main/xmli18n-tmp.h:314
 msgid "EPSON Stylus CX6300"
 msgstr "EPSON Stylus CX6300"
 
-#: src/main/xmli18n-tmp.h:293
+#: src/main/xmli18n-tmp.h:315
 msgid "EPSON Stylus CX6400"
 msgstr "EPSON Stylus CX6400"
 
-#: src/main/xmli18n-tmp.h:294
+#: src/main/xmli18n-tmp.h:316
 msgid "EPSON Stylus CX6500"
 msgstr "EPSON Stylus CX6500"
 
-#: src/main/xmli18n-tmp.h:295
+#: src/main/xmli18n-tmp.h:317
 msgid "EPSON Stylus CX6600"
 msgstr "EPSON Stylus CX6600"
 
-#: src/main/xmli18n-tmp.h:296
+#: src/main/xmli18n-tmp.h:318
+#, fuzzy
+msgid "EPSON Stylus CX7700"
+msgstr "EPSON Stylus C70"
+
+#: src/main/xmli18n-tmp.h:319
+#, fuzzy
+msgid "EPSON Stylus CX7800"
+msgstr "EPSON Stylus CX8300"
+
+#: src/main/xmli18n-tmp.h:320
 msgid "EPSON Stylus CX8300"
 msgstr "EPSON Stylus CX8300"
 
-#: src/main/xmli18n-tmp.h:297
+#: src/main/xmli18n-tmp.h:321
 msgid "EPSON Stylus CX8400"
 msgstr "EPSON Stylus CX8400"
 
-#: src/main/xmli18n-tmp.h:298
+#: src/main/xmli18n-tmp.h:322
+#, fuzzy
+msgid "EPSON Stylus D68"
+msgstr "EPSON Stylus C46"
+
+#: src/main/xmli18n-tmp.h:323
+#, fuzzy
+msgid "EPSON Stylus D88"
+msgstr "EPSON Stylus C80"
+
+#: src/main/xmli18n-tmp.h:324
+#, fuzzy
+msgid "EPSON Stylus DX3800"
+msgstr "EPSON Stylus CX3100"
+
+#: src/main/xmli18n-tmp.h:325
+#, fuzzy
+msgid "EPSON Stylus DX3850"
+msgstr "EPSON Stylus CX3500"
+
+#: src/main/xmli18n-tmp.h:326
+#, fuzzy
+msgid "EPSON Stylus DX4200"
+msgstr "EPSON Stylus CX3200"
+
+#: src/main/xmli18n-tmp.h:327
+#, fuzzy
+msgid "EPSON Stylus DX4800"
+msgstr "EPSON Stylus CX4600"
+
+#: src/main/xmli18n-tmp.h:328
 msgid "EPSON CL-700"
 msgstr "EPSON CL-700"
 
-#: src/main/xmli18n-tmp.h:299
+#: src/main/xmli18n-tmp.h:329
 msgid "EPSON CL-750"
 msgstr "EPSON CL-750"
 
-#: src/main/xmli18n-tmp.h:300
+#: src/main/xmli18n-tmp.h:330
 msgid "EPSON CL-760"
 msgstr "EPSON CL-760"
 
-#: src/main/xmli18n-tmp.h:301
+#: src/main/xmli18n-tmp.h:331
 msgid "EPSON EM-900C"
 msgstr "EPSON EM-900C"
 
-#: src/main/xmli18n-tmp.h:302
+#: src/main/xmli18n-tmp.h:332
 msgid "EPSON EM-930C"
 msgstr "EPSON EM-930C"
 
-#: src/main/xmli18n-tmp.h:303
+#: src/main/xmli18n-tmp.h:333
 msgid "EPSON MC-2000"
 msgstr "EPSON MC-2000"
 
-#: src/main/xmli18n-tmp.h:304
+#: src/main/xmli18n-tmp.h:334
 msgid "EPSON MC-5000"
 msgstr "EPSON MC-5000"
 
-#: src/main/xmli18n-tmp.h:305
+#: src/main/xmli18n-tmp.h:335
 msgid "EPSON MC-7000"
 msgstr "EPSON MC-7000"
 
-#: src/main/xmli18n-tmp.h:306
+#: src/main/xmli18n-tmp.h:336
 msgid "EPSON MC-9000"
 msgstr "EPSON MC-9000"
 
-#: src/main/xmli18n-tmp.h:307
+#: src/main/xmli18n-tmp.h:337
 msgid "EPSON MC-10000"
 msgstr "EPSON MC-10000"
 
-#: src/main/xmli18n-tmp.h:308
+#: src/main/xmli18n-tmp.h:338
 msgid "EPSON MJ-930C"
 msgstr "EPSON MJ-930C"
 
-#: src/main/xmli18n-tmp.h:309
+#: src/main/xmli18n-tmp.h:339
 msgid "EPSON MJ-5100C"
 msgstr "EPSON MJ-5100C"
 
-#: src/main/xmli18n-tmp.h:310
+#: src/main/xmli18n-tmp.h:340
 msgid "EPSON MJ-6000C"
 msgstr "EPSON MJ-6000C"
 
-#: src/main/xmli18n-tmp.h:311
+#: src/main/xmli18n-tmp.h:341
 msgid "EPSON MJ-8000C"
 msgstr "EPSON MJ-8000C"
 
-#: src/main/xmli18n-tmp.h:312
+#: src/main/xmli18n-tmp.h:342
 msgid "EPSON PM-700C"
 msgstr "EPSON PM-700C"
 
-#: src/main/xmli18n-tmp.h:313
+#: src/main/xmli18n-tmp.h:343
 msgid "EPSON PM-730C"
 msgstr "EPSON PM-730C"
 
-#: src/main/xmli18n-tmp.h:314
+#: src/main/xmli18n-tmp.h:344
 msgid "EPSON PM-740C"
 msgstr "EPSON PM-740C"
 
-#: src/main/xmli18n-tmp.h:315
+#: src/main/xmli18n-tmp.h:345
 msgid "EPSON PM-750C"
 msgstr "EPSON PM-750C"
 
-#: src/main/xmli18n-tmp.h:316
+#: src/main/xmli18n-tmp.h:346
 msgid "EPSON PM-760C"
 msgstr "EPSON PM-760C"
 
-#: src/main/xmli18n-tmp.h:317
+#: src/main/xmli18n-tmp.h:347
 msgid "EPSON PM-770C"
 msgstr "EPSON PM-770C"
 
-#: src/main/xmli18n-tmp.h:318
+#: src/main/xmli18n-tmp.h:348
 msgid "EPSON PM-780C"
 msgstr "EPSON PM-780C"
 
-#: src/main/xmli18n-tmp.h:319
+#: src/main/xmli18n-tmp.h:349
 msgid "EPSON PM-790PT"
 msgstr "EPSON PM-790PT"
 
-#: src/main/xmli18n-tmp.h:320
+#: src/main/xmli18n-tmp.h:350
 msgid "EPSON PM-800C"
 msgstr "EPSON PM-800C"
 
-#: src/main/xmli18n-tmp.h:321
+#: src/main/xmli18n-tmp.h:351
 msgid "EPSON PM-850PT"
 msgstr "EPSON PM-850PT"
 
-#: src/main/xmli18n-tmp.h:322
+#: src/main/xmli18n-tmp.h:352
 msgid "EPSON PM-870C"
 msgstr "EPSON PM-870C"
 
-#: src/main/xmli18n-tmp.h:323
+#: src/main/xmli18n-tmp.h:353
 msgid "EPSON PM-880C"
 msgstr "EPSON PM-880C"
 
-#: src/main/xmli18n-tmp.h:324
+#: src/main/xmli18n-tmp.h:354
 msgid "EPSON PM-930C"
 msgstr "EPSON PM-930C"
 
-#: src/main/xmli18n-tmp.h:325
+#: src/main/xmli18n-tmp.h:355
 msgid "EPSON PM-940C"
 msgstr "EPSON PM-940C"
 
-#: src/main/xmli18n-tmp.h:326
+#: src/main/xmli18n-tmp.h:356
 msgid "EPSON PM-950C"
 msgstr "EPSON PM-950C"
 
-#: src/main/xmli18n-tmp.h:327
+#: src/main/xmli18n-tmp.h:357
 msgid "EPSON PM-970C"
 msgstr "EPSON PM-970C"
 
-#: src/main/xmli18n-tmp.h:328
+#: src/main/xmli18n-tmp.h:358
 msgid "EPSON PM-980C"
 msgstr "EPSON PM-980C"
 
-#: src/main/xmli18n-tmp.h:329
+#: src/main/xmli18n-tmp.h:359
 msgid "EPSON PM-2000C"
 msgstr "EPSON PM-2000C"
 
-#: src/main/xmli18n-tmp.h:330
+#: src/main/xmli18n-tmp.h:360
 msgid "EPSON PM-2200C"
 msgstr "EPSON PM-2200C"
 
-#: src/main/xmli18n-tmp.h:331
+#: src/main/xmli18n-tmp.h:361
 msgid "EPSON PM-3000C"
 msgstr "EPSON PM-3000C"
 
-#: src/main/xmli18n-tmp.h:332
+#: src/main/xmli18n-tmp.h:362
 msgid "EPSON PM-3300C"
 msgstr "EPSON PM-3300C"
 
-#: src/main/xmli18n-tmp.h:333
+#: src/main/xmli18n-tmp.h:363
 msgid "EPSON PM-3500C"
 msgstr "EPSON PM-3500C"
 
-#: src/main/xmli18n-tmp.h:334
+#: src/main/xmli18n-tmp.h:364
 msgid "EPSON PM-3700C"
 msgstr "EPSON PM-3700C"
 
-#: src/main/xmli18n-tmp.h:335
+#: src/main/xmli18n-tmp.h:365
 msgid "EPSON PM-4000PX"
 msgstr "EPSON PM-4000PX"
 
-#: src/main/xmli18n-tmp.h:336
+#: src/main/xmli18n-tmp.h:366
 msgid "EPSON PM-5000C"
 msgstr "EPSON PM-5000C"
 
-#: src/main/xmli18n-tmp.h:337
+#: src/main/xmli18n-tmp.h:367
 msgid "EPSON PM-7000C"
 msgstr "EPSON PM-7000C"
 
-#: src/main/xmli18n-tmp.h:338
+#: src/main/xmli18n-tmp.h:368
 msgid "EPSON PM-9000C"
 msgstr "EPSON PM-9000C"
 
-#: src/main/xmli18n-tmp.h:339
+#: src/main/xmli18n-tmp.h:369
 msgid "EPSON PM-10000"
 msgstr "EPSON PM-10000"
 
-#: src/main/xmli18n-tmp.h:340
+#: src/main/xmli18n-tmp.h:370
 msgid "EPSON PM-D750"
 msgstr "EPSON PM-D750"
 
-#: src/main/xmli18n-tmp.h:341
+#: src/main/xmli18n-tmp.h:371
 msgid "EPSON PM-D770"
 msgstr "EPSON PM-D770"
 
-#: src/main/xmli18n-tmp.h:342
+#: src/main/xmli18n-tmp.h:372
 msgid "EPSON PM-D1000"
 msgstr "EPSON PM-D1000"
 
-#: src/main/xmli18n-tmp.h:343
+#: src/main/xmli18n-tmp.h:373
 msgid "EPSON PM-G700"
 msgstr "EPSON PM-G700"
 
-#: src/main/xmli18n-tmp.h:344
+#: src/main/xmli18n-tmp.h:374
 msgid "EPSON PM-G720"
 msgstr "EPSON PM-G720"
 
-#: src/main/xmli18n-tmp.h:345
+#: src/main/xmli18n-tmp.h:375
 msgid "EPSON PM-G800"
 msgstr "EPSON PM-G800"
 
-#: src/main/xmli18n-tmp.h:346
+#: src/main/xmli18n-tmp.h:376
 msgid "EPSON PM-G820"
 msgstr "EPSON PM-G820"
 
-#: src/main/xmli18n-tmp.h:347
+#: src/main/xmli18n-tmp.h:377
 msgid "EPSON PX-G900"
 msgstr "EPSON PX-G900"
 
-#: src/main/xmli18n-tmp.h:348
+#: src/main/xmli18n-tmp.h:378
 msgid "EPSON PX-G920"
 msgstr "EPSON PX-G920"
 
-#: src/main/xmli18n-tmp.h:349
+#: src/main/xmli18n-tmp.h:379
 msgid "EPSON PX-G5000"
 msgstr "EPSON PX-G5000"
 
-#: src/main/xmli18n-tmp.h:350
+#: src/main/xmli18n-tmp.h:380
 msgid "EPSON PX-V500"
 msgstr "EPSON PX-V500"
 
-#: src/main/xmli18n-tmp.h:351
+#: src/main/xmli18n-tmp.h:381
 msgid "EPSON PX-V600"
 msgstr "EPSON PX-V600"
 
-#: src/main/xmli18n-tmp.h:352
+#: src/main/xmli18n-tmp.h:382
 msgid "EPSON PX-7000"
 msgstr "EPSON PX-7000"
 
-#: src/main/xmli18n-tmp.h:353
+#: src/main/xmli18n-tmp.h:383
 msgid "EPSON PX-9000"
 msgstr "EPSON PX-9000"
 
-#: src/main/xmli18n-tmp.h:354
+#: src/main/xmli18n-tmp.h:384
 msgid "Apple Color StyleWriter 4100"
 msgstr "Apple Color StyleWriter 4100"
 
-#: src/main/xmli18n-tmp.h:355
+#: src/main/xmli18n-tmp.h:385
 msgid "Apple Color StyleWriter 4500"
 msgstr "Apple Color StyleWriter 4500"
 
-#: src/main/xmli18n-tmp.h:356
+#: src/main/xmli18n-tmp.h:386
 msgid "Apple Color StyleWriter 6500"
 msgstr "Apple Color StyleWriter 6500"
 
-#: src/main/xmli18n-tmp.h:357
+#: src/main/xmli18n-tmp.h:387
 msgid "HP DeskJet 340"
 msgstr "HP DeskJet 340"
 
-#: src/main/xmli18n-tmp.h:358
+#: src/main/xmli18n-tmp.h:388
 msgid "HP DeskJet 400"
 msgstr "HP DeskJet 400"
 
-#: src/main/xmli18n-tmp.h:359
+#: src/main/xmli18n-tmp.h:389
 msgid "HP DeskJet 500"
 msgstr "HP DeskJet 500"
 
-#: src/main/xmli18n-tmp.h:360
+#: src/main/xmli18n-tmp.h:390
 msgid "HP DesignJet 230"
 msgstr "HP DesignJet 230"
 
-#: src/main/xmli18n-tmp.h:361
+#: src/main/xmli18n-tmp.h:391
 msgid "HP DesignJet 250C"
 msgstr "HP DesignJet 250C"
 
-#: src/main/xmli18n-tmp.h:362
+#: src/main/xmli18n-tmp.h:392
 msgid "HP DesignJet 700"
 msgstr "HP DesignJet 700"
 
-#: src/main/xmli18n-tmp.h:363
+#: src/main/xmli18n-tmp.h:393
 msgid "HP DesignJet 750C"
 msgstr "HP DesignJet 750C"
 
-#: src/main/xmli18n-tmp.h:364
+#: src/main/xmli18n-tmp.h:394
 msgid "HP DesignJet 2500C"
 msgstr "HP DesignJet 2500C"
 
-#: src/main/xmli18n-tmp.h:365
+#: src/main/xmli18n-tmp.h:395
 msgid "HP DesignJet 3500C"
 msgstr "HP DesignJet 3500C"
 
-#: src/main/xmli18n-tmp.h:366
+#: src/main/xmli18n-tmp.h:396
 msgid "HP DesignJet 430"
 msgstr "HP DesignJet 430"
 
-#: src/main/xmli18n-tmp.h:367
+#: src/main/xmli18n-tmp.h:397
 msgid "HP DesignJet 450C"
 msgstr "HP DesignJet 450C"
 
-#: src/main/xmli18n-tmp.h:368
+#: src/main/xmli18n-tmp.h:398
 msgid "HP DesignJet 455CA"
 msgstr "HP DesignJet 455CA"
 
-#: src/main/xmli18n-tmp.h:369
+#: src/main/xmli18n-tmp.h:399
 msgid "HP DesignJet 488CA"
 msgstr "HP DesignJet 488CA"
 
-#: src/main/xmli18n-tmp.h:370
+#: src/main/xmli18n-tmp.h:400
 msgid "HP DeskJet 500C"
 msgstr "HP DeskJet 500C"
 
-#: src/main/xmli18n-tmp.h:371
+#: src/main/xmli18n-tmp.h:401
 msgid "HP DeskJet 520"
 msgstr "HP DeskJet 520"
 
-#: src/main/xmli18n-tmp.h:372
+#: src/main/xmli18n-tmp.h:402
 msgid "HP DeskJet 540C"
 msgstr "HP DeskJet 540C"
 
-#: src/main/xmli18n-tmp.h:373
+#: src/main/xmli18n-tmp.h:403
 msgid "HP DeskJet 550C"
 msgstr "HP DeskJet 550C"
 
-#: src/main/xmli18n-tmp.h:374
+#: src/main/xmli18n-tmp.h:404
 msgid "HP DeskJet 560C"
 msgstr "HP DeskJet 560C"
 
-#: src/main/xmli18n-tmp.h:375
+#: src/main/xmli18n-tmp.h:405
 msgid "HP DeskJet 600/600C"
 msgstr "HP DeskJet 600/600C"
 
-#: src/main/xmli18n-tmp.h:376
+#: src/main/xmli18n-tmp.h:406
 msgid "HP DeskJet 600 series"
 msgstr "HP DeskJet 600 系列"
 
-#: src/main/xmli18n-tmp.h:377
+#: src/main/xmli18n-tmp.h:407
 msgid "HP DeskJet 690 series"
 msgstr "HP DeskJet 690 系列"
 
-#: src/main/xmli18n-tmp.h:378
+#: src/main/xmli18n-tmp.h:408
 msgid "HP DeskJet 810C"
 msgstr "HP DeskJet 810C"
 
-#: src/main/xmli18n-tmp.h:379
+#: src/main/xmli18n-tmp.h:409
 msgid "HP DeskJet 812C"
 msgstr "HP DeskJet 812C"
 
-#: src/main/xmli18n-tmp.h:380
+#: src/main/xmli18n-tmp.h:410
 msgid "HP DeskJet 840C"
 msgstr "HP DeskJet 840C"
 
-#: src/main/xmli18n-tmp.h:381
+#: src/main/xmli18n-tmp.h:411
 msgid "HP DeskJet 842C"
 msgstr "HP DeskJet 842C"
 
-#: src/main/xmli18n-tmp.h:382
+#: src/main/xmli18n-tmp.h:412
 msgid "HP DeskJet 845C"
 msgstr "HP DeskJet 845C"
 
-#: src/main/xmli18n-tmp.h:383
+#: src/main/xmli18n-tmp.h:413
 msgid "HP DeskJet 850C"
 msgstr "HP DeskJet 850C"
 
-#: src/main/xmli18n-tmp.h:384
+#: src/main/xmli18n-tmp.h:414
 msgid "HP DeskJet 855C"
 msgstr "HP DeskJet 855C"
 
-#: src/main/xmli18n-tmp.h:385
+#: src/main/xmli18n-tmp.h:415
 msgid "HP DeskJet 870C"
 msgstr "HP DeskJet 870C"
 
-#: src/main/xmli18n-tmp.h:386
+#: src/main/xmli18n-tmp.h:416
 msgid "HP DeskJet 890C"
 msgstr "HP DeskJet 890C"
 
-#: src/main/xmli18n-tmp.h:387
+#: src/main/xmli18n-tmp.h:417
 msgid "HP DeskJet 895C"
 msgstr "HP DeskJet 895C"
 
-#: src/main/xmli18n-tmp.h:388
+#: src/main/xmli18n-tmp.h:418
 msgid "HP DeskJet 900 series"
 msgstr "HP DeskJet 900 系列"
 
-#: src/main/xmli18n-tmp.h:389
+#: src/main/xmli18n-tmp.h:419
 msgid "HP DeskJet 1100C"
 msgstr "HP DeskJet 1100C"
 
-#: src/main/xmli18n-tmp.h:390
+#: src/main/xmli18n-tmp.h:420
 msgid "HP DeskJet 1120C"
 msgstr "HP DeskJet 1120C"
 
-#: src/main/xmli18n-tmp.h:391
+#: src/main/xmli18n-tmp.h:421
 msgid "HP DeskJet 1200C"
 msgstr "HP DeskJet 1200C"
 
-#: src/main/xmli18n-tmp.h:392
+#: src/main/xmli18n-tmp.h:422
 msgid "HP DeskJet 1220C"
 msgstr "HP DeskJet 1220C"
 
-#: src/main/xmli18n-tmp.h:393
+#: src/main/xmli18n-tmp.h:423
 msgid "HP DeskJet 1600C"
 msgstr "HP DeskJet 1600C"
 
-#: src/main/xmli18n-tmp.h:394
+#: src/main/xmli18n-tmp.h:424
 msgid "HP DeskJet 2000 series"
 msgstr "HP DeskJet 2000 系列"
 
-#: src/main/xmli18n-tmp.h:395
+#: src/main/xmli18n-tmp.h:425
 msgid "HP DeskJet 2500 series"
 msgstr "HP DeskJet 2500 系列"
 
-#: src/main/xmli18n-tmp.h:396
+#: src/main/xmli18n-tmp.h:426
 msgid "HP PhotoSmart P1000"
 msgstr "HP PhotoSmart P1000"
 
-#: src/main/xmli18n-tmp.h:397
+#: src/main/xmli18n-tmp.h:427
 msgid "HP PhotoSmart P1100"
 msgstr "HP PhotoSmart P1100"
 
-#: src/main/xmli18n-tmp.h:398
+#: src/main/xmli18n-tmp.h:428
 msgid "HP LaserJet II series"
 msgstr "HP LaserJet II 系列"
 
-#: src/main/xmli18n-tmp.h:399
+#: src/main/xmli18n-tmp.h:429
 msgid "HP LaserJet IIP series"
 msgstr "HP LaserJet IIP 系列"
 
-#: src/main/xmli18n-tmp.h:400
+#: src/main/xmli18n-tmp.h:430
 msgid "HP LaserJet III series"
 msgstr "HP LaserJet III 系列"
 
-#: src/main/xmli18n-tmp.h:401
+#: src/main/xmli18n-tmp.h:431
 msgid "HP LaserJet 4 series"
 msgstr "HP LaserJet 4 系列"
 
-#: src/main/xmli18n-tmp.h:402
+#: src/main/xmli18n-tmp.h:432
 msgid "HP LaserJet 4L"
 msgstr "HP LaserJet 4L"
 
-#: src/main/xmli18n-tmp.h:403
+#: src/main/xmli18n-tmp.h:433
 msgid "HP LaserJet 4V"
 msgstr "HP LaserJet 4V"
 
-#: src/main/xmli18n-tmp.h:404
+#: src/main/xmli18n-tmp.h:434
 msgid "HP LaserJet 4Si"
 msgstr "HP LaserJet 4Si"
 
-#: src/main/xmli18n-tmp.h:405
+#: src/main/xmli18n-tmp.h:435
 msgid "HP LaserJet 5 series"
 msgstr "HP LaserJet 5 系列"
 
-#: src/main/xmli18n-tmp.h:406
+#: src/main/xmli18n-tmp.h:436
 msgid "HP LaserJet 5Si"
 msgstr "HP LaserJet 5Si"
 
-#: src/main/xmli18n-tmp.h:407
+#: src/main/xmli18n-tmp.h:437
 msgid "HP LaserJet 6 series"
 msgstr "HP LaserJet 6 系列"
 
-#: src/main/xmli18n-tmp.h:408
+#: src/main/xmli18n-tmp.h:438
 msgid "Lexmark 4076"
 msgstr "Lexmark 4076"
 
-#: src/main/xmli18n-tmp.h:409
+#: src/main/xmli18n-tmp.h:439
 msgid "Lexmark Z42"
 msgstr "Lexmark Z42"
 
-#: src/main/xmli18n-tmp.h:410
+#: src/main/xmli18n-tmp.h:440
 msgid "Lexmark Z43"
 msgstr "Lexmark Z43"
 
-#: src/main/xmli18n-tmp.h:411
+#: src/main/xmli18n-tmp.h:441
 msgid "Lexmark Z52"
 msgstr "Lexmark Z52"
 
-#: src/main/xmli18n-tmp.h:412
+#: src/main/xmli18n-tmp.h:442
 msgid "Lexmark Z53"
 msgstr "Lexmark Z53"
 
-#: src/main/xmli18n-tmp.h:413
+#: src/main/xmli18n-tmp.h:443
 msgid "Olympus P10"
 msgstr "Olympus P10"
 
-#: src/main/xmli18n-tmp.h:414
+#: src/main/xmli18n-tmp.h:444
 msgid "Olympus P200"
 msgstr "Olympus P200"
 
-#: src/main/xmli18n-tmp.h:415
+#: src/main/xmli18n-tmp.h:445
 msgid "Olympus P300"
 msgstr "Olympus P300"
 
-#: src/main/xmli18n-tmp.h:416
+#: src/main/xmli18n-tmp.h:446
 msgid "Olympus P400"
 msgstr "Olympus P400"
 
-#: src/main/xmli18n-tmp.h:417
+#: src/main/xmli18n-tmp.h:447
 msgid "Olympus P440"
 msgstr "Olympus P440"
 
-#: src/main/xmli18n-tmp.h:418
+#: src/main/xmli18n-tmp.h:448
 msgid "Canon CP100"
 msgstr "Canon CP100"
 
-#: src/main/xmli18n-tmp.h:419
+#: src/main/xmli18n-tmp.h:449
 msgid "Canon CP220"
 msgstr "Canon CP220"
 
-#: src/main/xmli18n-tmp.h:420
+#: src/main/xmli18n-tmp.h:450
 msgid "Sony UP-DP10"
 msgstr "Sony UP-DP10"
 
-#: src/main/xmli18n-tmp.h:421
+#: src/main/xmli18n-tmp.h:451
+#, fuzzy
+msgid "Sony UP-DR150"
+msgstr "Sony UP-DP10"
+
+#: src/main/xmli18n-tmp.h:452
 msgid "Fujifilm Printpix CX-400"
 msgstr "Fujifilm Printpix CX-400"
 
-#: src/main/xmli18n-tmp.h:422
+#: src/main/xmli18n-tmp.h:453
 msgid "Fujifilm Printpix CX-550"
 msgstr "Fujifilm Printpix CX-550"
 
-#: src/main/xmli18n-tmp.h:423
+#: src/main/xmli18n-tmp.h:454
 msgid "RAW DATA 16 bit"
 msgstr ""
 
-#: src/main/xmli18n-tmp.h:424
+#: src/main/xmli18n-tmp.h:455
 msgid "RAW DATA 8 bit"
 msgstr ""
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Inch"
 msgstr "英�"
 
-#: src/gutenprintui/panel.c:266 src/gutenprintui2/panel.c:266
+#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
 msgid "Set the base unit of measurement to inches"
 msgstr "以英�作為長度單�"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "cm"
 msgstr "公分"
 
-#: src/gutenprintui/panel.c:268 src/gutenprintui2/panel.c:268
+#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
 msgid "Set the base unit of measurement to centimetres"
 msgstr "以公分作為長度單�"
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Points"
 msgstr ""
 
-#: src/gutenprintui/panel.c:270 src/gutenprintui2/panel.c:270
+#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
 msgid "Set the base unit of measurement to points (1/72\")"
 msgstr ""
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "mm"
 msgstr "毫米"
 
-#: src/gutenprintui/panel.c:272 src/gutenprintui2/panel.c:272
+#: src/gutenprintui/panel.c:276 src/gutenprintui2/panel.c:276
 msgid "Set the base unit of measurement to millimetres"
 msgstr "以毫米作為長度單�"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Pica"
 msgstr "鉛點"
 
-#: src/gutenprintui/panel.c:274 src/gutenprintui2/panel.c:274
+#: src/gutenprintui/panel.c:278 src/gutenprintui2/panel.c:278
 msgid "Set the base unit of measurement to picas (1/12\")"
 msgstr "以鉛點 (1/12\") 作為長度單�"
 
-#: src/gutenprintui/panel.c:281 src/gutenprintui2/panel.c:281
+#: src/gutenprintui/panel.c:285 src/gutenprintui2/panel.c:285
 msgid "Color output"
 msgstr "使用彩色列�"
 
-#: src/gutenprintui/panel.c:283 src/gutenprintui2/panel.c:283
+#: src/gutenprintui/panel.c:287 src/gutenprintui2/panel.c:287
 msgid "Print in shades of gray using black ink"
 msgstr "使用黑色墨水來列��階色彩"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Standard Command"
 msgstr "標準指令"
 
-#: src/gutenprintui/panel.c:295 src/gutenprintui2/panel.c:295
+#: src/gutenprintui/panel.c:299 src/gutenprintui2/panel.c:299
 msgid "Use standard print command"
 msgstr "使用標準列�指令"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Custom Command"
 msgstr "自�指令"
 
-#: src/gutenprintui/panel.c:296 src/gutenprintui2/panel.c:296
+#: src/gutenprintui/panel.c:300 src/gutenprintui2/panel.c:300
 msgid "Use custom print command"
 msgstr "使用自行指定的列�指令"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui/plist.c:660
-#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:297
-#: src/gutenprintui2/plist.c:656 src/gutenprintui2/plist.c:739
+#: src/gutenprintui/panel.c:301 src/gutenprintui/plist.c:660
+#: src/gutenprintui/plist.c:743 src/gutenprintui2/panel.c:301
+#: src/gutenprintui2/plist.c:671 src/gutenprintui2/plist.c:754
 msgid "File"
 msgstr "檔案"
 
-#: src/gutenprintui/panel.c:297 src/gutenprintui2/panel.c:297
+#: src/gutenprintui/panel.c:301 src/gutenprintui2/panel.c:301
 msgid "Print to a file"
 msgstr "列�至檔案"
 
-#: src/gutenprintui/panel.c:513 src/gutenprintui2/panel.c:513
+#: src/gutenprintui/panel.c:517 src/gutenprintui2/panel.c:517
 msgid "Edit Curve..."
 msgstr ""
 
-#: src/gutenprintui/panel.c:524 src/gutenprintui2/panel.c:524
+#: src/gutenprintui/panel.c:528 src/gutenprintui2/panel.c:528
 msgid "Set Default"
 msgstr ""
 
-#: src/gutenprintui/panel.c:526 src/gutenprintui2/panel.c:526
+#: src/gutenprintui/panel.c:530 src/gutenprintui2/panel.c:530
 msgid "Restore Previous"
 msgstr ""
 
-#: src/gutenprintui/panel.c:528 src/gutenprintui/panel.c:1514
-#: src/gutenprintui/panel.c:1754 src/gutenprintui/panel.c:1786
-#: src/gutenprintui2/panel.c:528 src/gutenprintui2/panel.c:1514
-#: src/gutenprintui2/panel.c:1753 src/gutenprintui2/panel.c:1785
+#: src/gutenprintui/panel.c:532 src/gutenprintui/panel.c:1517
+#: src/gutenprintui/panel.c:1757 src/gutenprintui/panel.c:1789
+#: src/gutenprintui2/panel.c:532 src/gutenprintui2/panel.c:1517
+#: src/gutenprintui2/panel.c:1756 src/gutenprintui2/panel.c:1788
 msgid "OK"
 msgstr "確定"
 
-#: src/gutenprintui/panel.c:530 src/gutenprintui/panel.c:1178
-#: src/gutenprintui/panel.c:1516 src/gutenprintui/panel.c:1756
-#: src/gutenprintui2/panel.c:530 src/gutenprintui2/panel.c:1179
-#: src/gutenprintui2/panel.c:1516 src/gutenprintui2/panel.c:1755
+#: src/gutenprintui/panel.c:534 src/gutenprintui/panel.c:1181
+#: src/gutenprintui/panel.c:1519 src/gutenprintui/panel.c:1759
+#: src/gutenprintui2/panel.c:534 src/gutenprintui2/panel.c:1182
+#: src/gutenprintui2/panel.c:1519 src/gutenprintui2/panel.c:1758
 msgid "Cancel"
 msgstr "�消"
 
-#: src/gutenprintui/panel.c:1161 src/gutenprintui2/panel.c:1162
+#: src/gutenprintui/panel.c:1164 src/gutenprintui2/panel.c:1165
 #, c-format
 msgid "%s -- Print v%s"
 msgstr "%s -- 列�增效模組 %s 版本"
 
-#: src/gutenprintui/panel.c:1170 src/gutenprintui2/panel.c:1171
+#: src/gutenprintui/panel.c:1173 src/gutenprintui2/panel.c:1174
 msgid "About"
 msgstr "關於"
 
-#: src/gutenprintui/panel.c:1172 src/gutenprintui2/panel.c:1173
+#: src/gutenprintui/panel.c:1175 src/gutenprintui2/panel.c:1176
 msgid ""
 "Print and\n"
 "Save Settings"
@@ -3915,7 +4136,7 @@ msgstr ""
 "列�並\n"
 "儲存設定"
 
-#: src/gutenprintui/panel.c:1174 src/gutenprintui2/panel.c:1175
+#: src/gutenprintui/panel.c:1177 src/gutenprintui2/panel.c:1178
 msgid ""
 "Save\n"
 "Settings"
@@ -3923,15 +4144,15 @@ msgstr ""
 "儲存\n"
 "設定"
 
-#: src/gutenprintui/panel.c:1176 src/gutenprintui2/panel.c:1177
+#: src/gutenprintui/panel.c:1179 src/gutenprintui2/panel.c:1180
 msgid "Print"
 msgstr "列�"
 
-#: src/gutenprintui/panel.c:1228 src/gutenprintui2/panel.c:1229
+#: src/gutenprintui/panel.c:1231 src/gutenprintui2/panel.c:1232
 msgid "Preview"
 msgstr "�覽"
 
-#: src/gutenprintui/panel.c:1253 src/gutenprintui2/panel.c:1254
+#: src/gutenprintui/panel.c:1256 src/gutenprintui2/panel.c:1257
 msgid ""
 "Position the image on the page.\n"
 "Click and drag with the primary button to position the image.\n"
@@ -3953,238 +4174,238 @@ msgstr ""
 "拖曳影�時按下 shift �，會�制影���水平或垂直方�移動。\n"
 "如果拖曳的時候�按多一個滑鼠按鈕，影�會還原至原來�置。"
 
-#: src/gutenprintui/panel.c:1300 src/gutenprintui2/panel.c:1301
+#: src/gutenprintui/panel.c:1303 src/gutenprintui2/panel.c:1304
 msgid "Paper Size"
 msgstr "紙張尺寸"
 
-#: src/gutenprintui/panel.c:1323 src/gutenprintui2/panel.c:1324
+#: src/gutenprintui/panel.c:1326 src/gutenprintui2/panel.c:1327
 msgid "Show All Paper Sizes"
 msgstr "顯示所有紙張尺寸"
 
-#: src/gutenprintui/panel.c:1339 src/gutenprintui2/panel.c:1340
+#: src/gutenprintui/panel.c:1342 src/gutenprintui2/panel.c:1343
 msgid "Dimensions:"
 msgstr "尺寸："
 
-#: src/gutenprintui/panel.c:1344 src/gutenprintui/panel.c:2020
-#: src/gutenprintui2/panel.c:1345 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:1347 src/gutenprintui/panel.c:2023
+#: src/gutenprintui2/panel.c:1348 src/gutenprintui2/panel.c:2021
 msgid "Width:"
 msgstr "寬度："
 
-#: src/gutenprintui/panel.c:1345 src/gutenprintui2/panel.c:1346
+#: src/gutenprintui/panel.c:1348 src/gutenprintui2/panel.c:1349
 msgid "Width of the paper that you wish to print to"
 msgstr "列�時的紙張寬度"
 
-#: src/gutenprintui/panel.c:1349 src/gutenprintui/panel.c:2022
-#: src/gutenprintui2/panel.c:1350 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:1352 src/gutenprintui/panel.c:2025
+#: src/gutenprintui2/panel.c:1353 src/gutenprintui2/panel.c:2023
 msgid "Height:"
 msgstr "高度："
 
-#: src/gutenprintui/panel.c:1350 src/gutenprintui2/panel.c:1351
+#: src/gutenprintui/panel.c:1353 src/gutenprintui2/panel.c:1354
 msgid "Height of the paper that you wish to print to"
 msgstr "列�時的紙張高度"
 
-#: src/gutenprintui/panel.c:1355 src/gutenprintui2/panel.c:1356
+#: src/gutenprintui/panel.c:1358 src/gutenprintui2/panel.c:1359
 msgid "Automatic Paper Size"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1373 src/gutenprintui2/panel.c:1373
+#: src/gutenprintui/panel.c:1376 src/gutenprintui2/panel.c:1376
 msgid "Number of Copies"
 msgstr "份數"
 
-#: src/gutenprintui/panel.c:1385 src/gutenprintui2/panel.c:1385
+#: src/gutenprintui/panel.c:1388 src/gutenprintui2/panel.c:1388
 msgid "Select the number of copies to print; a value between 1 and 100"
 msgstr "請�擇列�多少份 (1-100 之間)"
 
-#: src/gutenprintui/panel.c:1417 src/gutenprintui2/panel.c:1417
+#: src/gutenprintui/panel.c:1420 src/gutenprintui2/panel.c:1420
 msgid "Image Position"
 msgstr "影��置"
 
-#: src/gutenprintui/panel.c:1434 src/gutenprintui2/panel.c:1434
+#: src/gutenprintui/panel.c:1437 src/gutenprintui2/panel.c:1437
 msgid "Auto"
 msgstr "自動"
 
-#: src/gutenprintui/panel.c:1436 src/gutenprintui2/panel.c:1436
+#: src/gutenprintui/panel.c:1439 src/gutenprintui2/panel.c:1439
 msgid "Portrait"
 msgstr "直�"
 
-#: src/gutenprintui/panel.c:1438 src/gutenprintui2/panel.c:1438
+#: src/gutenprintui/panel.c:1441 src/gutenprintui2/panel.c:1441
 msgid "Landscape"
 msgstr "橫�"
 
-#: src/gutenprintui/panel.c:1440 src/gutenprintui2/panel.c:1440
+#: src/gutenprintui/panel.c:1443 src/gutenprintui2/panel.c:1443
 msgid "Upside down"
 msgstr "直�倒置"
 
-#: src/gutenprintui/panel.c:1442 src/gutenprintui2/panel.c:1442
+#: src/gutenprintui/panel.c:1445 src/gutenprintui2/panel.c:1445
 msgid "Seascape"
 msgstr "橫�倒置"
 
-#: src/gutenprintui/panel.c:1446 src/gutenprintui2/panel.c:1446
+#: src/gutenprintui/panel.c:1449 src/gutenprintui2/panel.c:1449
 msgid ""
 "Select the orientation: portrait, landscape, upside down, or seascape "
 "(upside down landscape)"
 msgstr "指定列�時的方�：直��橫��直�倒置�橫�倒置"
 
-#: src/gutenprintui/panel.c:1448 src/gutenprintui2/panel.c:1448
+#: src/gutenprintui/panel.c:1451 src/gutenprintui2/panel.c:1451
 msgid "Orientation:"
 msgstr "方�："
 
-#: src/gutenprintui/panel.c:1459 src/gutenprintui2/panel.c:1459
+#: src/gutenprintui/panel.c:1462 src/gutenprintui2/panel.c:1462
 msgid "Left:"
 msgstr "左："
 
-#: src/gutenprintui/panel.c:1460 src/gutenprintui2/panel.c:1460
+#: src/gutenprintui/panel.c:1463 src/gutenprintui2/panel.c:1463
 msgid "Distance from the left of the paper to the image"
 msgstr "從紙張左邊邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1463 src/gutenprintui/panel.c:1467
-#: src/gutenprintui2/panel.c:1463 src/gutenprintui2/panel.c:1467
+#: src/gutenprintui/panel.c:1466 src/gutenprintui/panel.c:1470
+#: src/gutenprintui2/panel.c:1466 src/gutenprintui2/panel.c:1470
 msgid "Right:"
 msgstr "�："
 
-#: src/gutenprintui/panel.c:1464 src/gutenprintui2/panel.c:1464
+#: src/gutenprintui/panel.c:1467 src/gutenprintui2/panel.c:1467
 msgid "Distance from the left of the paper to the right of the image"
 msgstr "從紙張左邊邊緣至影��邊邊緣之間的�離"
 
-#: src/gutenprintui/panel.c:1468 src/gutenprintui2/panel.c:1468
+#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
 msgid "Distance from the right of the paper to the image"
 msgstr "從紙張�邊邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1470 src/gutenprintui2/panel.c:1470
+#: src/gutenprintui/panel.c:1473 src/gutenprintui2/panel.c:1473
 msgid "Top:"
 msgstr "上："
 
-#: src/gutenprintui/panel.c:1471 src/gutenprintui2/panel.c:1471
+#: src/gutenprintui/panel.c:1474 src/gutenprintui2/panel.c:1474
 msgid "Distance from the top of the paper to the image"
 msgstr "從紙張頂部邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1474 src/gutenprintui/panel.c:1478
-#: src/gutenprintui2/panel.c:1474 src/gutenprintui2/panel.c:1478
+#: src/gutenprintui/panel.c:1477 src/gutenprintui/panel.c:1481
+#: src/gutenprintui2/panel.c:1477 src/gutenprintui2/panel.c:1481
 msgid "Bottom:"
 msgstr "下："
 
-#: src/gutenprintui/panel.c:1475 src/gutenprintui2/panel.c:1475
+#: src/gutenprintui/panel.c:1478 src/gutenprintui2/panel.c:1478
 msgid "Distance from the top of the paper to bottom of the image"
 msgstr "從紙張頂部邊緣至影�底部邊緣之間的�離"
 
-#: src/gutenprintui/panel.c:1479 src/gutenprintui2/panel.c:1479
+#: src/gutenprintui/panel.c:1482 src/gutenprintui2/panel.c:1482
 msgid "Distance from the bottom of the paper to the image"
 msgstr "從紙張底部邊緣至影�之間的�離"
 
-#: src/gutenprintui/panel.c:1489 src/gutenprintui2/panel.c:1489
+#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
 msgid "Center:"
 msgstr "置中："
 
-#: src/gutenprintui/panel.c:1492 src/gutenprintui2/panel.c:1492
+#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
 msgid "Horizontal"
 msgstr "æ°´å¹³"
 
-#: src/gutenprintui/panel.c:1493 src/gutenprintui2/panel.c:1493
+#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
 msgid "Center the image horizontally on the paper"
 msgstr "將影�的水平�置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1495 src/gutenprintui2/panel.c:1495
+#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
 msgid "Both"
 msgstr "兩者"
 
-#: src/gutenprintui/panel.c:1496 src/gutenprintui2/panel.c:1496
+#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
 msgid "Center the image on the paper"
 msgstr "將影�放置在紙張中間"
 
-#: src/gutenprintui/panel.c:1498 src/gutenprintui2/panel.c:1498
+#: src/gutenprintui/panel.c:1501 src/gutenprintui2/panel.c:1501
 msgid "Vertical"
 msgstr "åž‚ç›´"
 
-#: src/gutenprintui/panel.c:1499 src/gutenprintui2/panel.c:1499
+#: src/gutenprintui/panel.c:1502 src/gutenprintui2/panel.c:1502
 msgid "Center the image vertically on the paper"
 msgstr "將影�的垂直�置調整至紙張中間"
 
-#: src/gutenprintui/panel.c:1512 src/gutenprintui2/panel.c:1512
+#: src/gutenprintui/panel.c:1515 src/gutenprintui2/panel.c:1515
 msgid "Setup Printer"
 msgstr "設定�表機"
 
-#: src/gutenprintui/panel.c:1537 src/gutenprintui2/panel.c:1536
+#: src/gutenprintui/panel.c:1540 src/gutenprintui2/panel.c:1539
 msgid "Printer Make:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1548 src/gutenprintui2/panel.c:1547
+#: src/gutenprintui/panel.c:1551 src/gutenprintui2/panel.c:1550
 msgid "Select the make of your printer"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1566 src/gutenprintui/panel.c:1857
-#: src/gutenprintui2/panel.c:1565 src/gutenprintui2/panel.c:1856
+#: src/gutenprintui/panel.c:1569 src/gutenprintui/panel.c:1860
+#: src/gutenprintui2/panel.c:1568 src/gutenprintui2/panel.c:1859
 msgid "Printer Model:"
 msgstr "�表機型號："
 
-#: src/gutenprintui/panel.c:1577 src/gutenprintui2/panel.c:1576
+#: src/gutenprintui/panel.c:1580 src/gutenprintui2/panel.c:1579
 msgid "Select your printer model"
 msgstr "請���表機型號"
 
-#: src/gutenprintui/panel.c:1625 src/gutenprintui2/panel.c:1624
+#: src/gutenprintui/panel.c:1628 src/gutenprintui2/panel.c:1627
 msgid "PPD File:"
 msgstr "PPD 檔："
 
-#: src/gutenprintui/panel.c:1639 src/gutenprintui2/panel.c:1638
+#: src/gutenprintui/panel.c:1642 src/gutenprintui2/panel.c:1641
 msgid "Enter the correct PPD filename for your printer"
 msgstr "請輸入��您的�表機使用的 PPD 檔案�稱"
 
-#: src/gutenprintui/panel.c:1641 src/gutenprintui/panel.c:1708
-#: src/gutenprintui2/panel.c:1640 src/gutenprintui2/panel.c:1707
+#: src/gutenprintui/panel.c:1644 src/gutenprintui/panel.c:1711
+#: src/gutenprintui2/panel.c:1643 src/gutenprintui2/panel.c:1710
 msgid "Browse"
 msgstr "�覽"
 
-#: src/gutenprintui/panel.c:1648 src/gutenprintui2/panel.c:1647
+#: src/gutenprintui/panel.c:1651 src/gutenprintui2/panel.c:1650
 msgid "Choose the correct PPD filename for your printer"
 msgstr "請�擇��您的�表機使用的 PPD 檔案�稱"
 
-#: src/gutenprintui/panel.c:1677 src/gutenprintui2/panel.c:1676
+#: src/gutenprintui/panel.c:1680 src/gutenprintui2/panel.c:1679
 msgid ""
 "Select the name of the output queue (not the type, or model, of printer) "
 "that you wish to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1679 src/gutenprintui2/panel.c:1678
+#: src/gutenprintui/panel.c:1682 src/gutenprintui2/panel.c:1681
 msgid "Printer Queue:"
 msgstr "�表機佇列："
 
-#: src/gutenprintui/panel.c:1695 src/gutenprintui2/panel.c:1694
+#: src/gutenprintui/panel.c:1698 src/gutenprintui2/panel.c:1697
 msgid "Enter the correct command to print to your printer. "
 msgstr "請輸入列�所使用的指令。"
 
-#: src/gutenprintui/panel.c:1706 src/gutenprintui2/panel.c:1705
+#: src/gutenprintui/panel.c:1709 src/gutenprintui2/panel.c:1708
 msgid "Enter the file to print to. "
 msgstr "請輸入列�時寫入的檔案。"
 
-#: src/gutenprintui/panel.c:1714 src/gutenprintui2/panel.c:1713
+#: src/gutenprintui/panel.c:1717 src/gutenprintui2/panel.c:1716
 msgid "File to print to"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1722 src/gutenprintui2/panel.c:1721
+#: src/gutenprintui/panel.c:1725 src/gutenprintui2/panel.c:1724
 msgid "Print To File"
 msgstr "列�至檔案"
 
-#: src/gutenprintui/panel.c:1752 src/gutenprintui2/panel.c:1751
+#: src/gutenprintui/panel.c:1755 src/gutenprintui2/panel.c:1754
 msgid "Define New Printer"
 msgstr "定義新的�表機"
 
-#: src/gutenprintui/panel.c:1770 src/gutenprintui/panel.c:1854
-#: src/gutenprintui2/panel.c:1769 src/gutenprintui2/panel.c:1853
+#: src/gutenprintui/panel.c:1773 src/gutenprintui/panel.c:1857
+#: src/gutenprintui2/panel.c:1772 src/gutenprintui2/panel.c:1856
 msgid "Printer Name:"
 msgstr "�表機�稱："
 
-#: src/gutenprintui/panel.c:1774 src/gutenprintui2/panel.c:1773
+#: src/gutenprintui/panel.c:1777 src/gutenprintui2/panel.c:1776
 msgid "Enter the name you wish to give this logical printer"
 msgstr "為這個虛擬�表機命�"
 
-#: src/gutenprintui/panel.c:1784 src/gutenprintui2/panel.c:1783
+#: src/gutenprintui/panel.c:1787 src/gutenprintui2/panel.c:1786
 msgid "About Gutenprint "
 msgstr "關於 Gutenprint "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 msgid "Gutenprint Version "
 msgstr "Gutenprint 版本 "
 
-#: src/gutenprintui/panel.c:1791 src/gutenprintui2/panel.c:1790
+#: src/gutenprintui/panel.c:1794 src/gutenprintui2/panel.c:1793
 #, fuzzy
 msgid ""
 "\n"
@@ -4223,83 +4444,83 @@ msgstr ""
 "您應已收到附隨於本程�的GNU通用公共授權的副本；如無，請寫信至自由軟體基金會："
 "59 Temple Place – Suite 330, Boston, Ma 02111-1307, USA。\n"
 
-#: src/gutenprintui/panel.c:1839 src/gutenprintui2/panel.c:1838
+#: src/gutenprintui/panel.c:1842 src/gutenprintui2/panel.c:1841
 msgid "Printer Settings"
 msgstr "�表機設定"
 
-#: src/gutenprintui/panel.c:1852 src/gutenprintui2/panel.c:1851
+#: src/gutenprintui/panel.c:1855 src/gutenprintui2/panel.c:1854
 msgid ""
 "Select the name of the printer (not the type, or model, of printer) that you "
 "wish to print to"
 msgstr "指定�表機�稱 (�是�表機類型或者型號)"
 
-#: src/gutenprintui/panel.c:1870 src/gutenprintui2/panel.c:1868
+#: src/gutenprintui/panel.c:1873 src/gutenprintui2/panel.c:1871
 msgid "Setup Printer..."
 msgstr "設定�表機..."
 
-#: src/gutenprintui/panel.c:1872 src/gutenprintui2/panel.c:1870
+#: src/gutenprintui/panel.c:1875 src/gutenprintui2/panel.c:1873
 msgid ""
 "Choose the printer model, PPD file, and command that is used to print to "
 "this printer"
 msgstr "��列�時使用的�表機型號�PPD 檔�指令"
 
-#: src/gutenprintui/panel.c:1885 src/gutenprintui2/panel.c:1883
+#: src/gutenprintui/panel.c:1888 src/gutenprintui2/panel.c:1886
 msgid "New Printer..."
 msgstr "新增�表機..."
 
-#: src/gutenprintui/panel.c:1886 src/gutenprintui2/panel.c:1884
+#: src/gutenprintui/panel.c:1889 src/gutenprintui2/panel.c:1887
 msgid ""
 "Define a new logical printer. This can be used to name a collection of "
 "settings that you wish to remember for future use."
 msgstr "定義新的虛擬�表機。這個「�表機�其實是代表一組設定，以便將來使用。"
 
-#: src/gutenprintui/panel.c:1929 src/gutenprintui2/panel.c:1927
+#: src/gutenprintui/panel.c:1932 src/gutenprintui2/panel.c:1930
 msgid "Image Size"
 msgstr "影�尺寸"
 
-#: src/gutenprintui/panel.c:1954 src/gutenprintui2/panel.c:1952
+#: src/gutenprintui/panel.c:1957 src/gutenprintui2/panel.c:1955
 msgid "Scaling:"
 msgstr "縮放："
 
-#: src/gutenprintui/panel.c:1958 src/gutenprintui2/panel.c:1956
+#: src/gutenprintui/panel.c:1961 src/gutenprintui2/panel.c:1959
 msgid "Set the scale (size) of the image"
 msgstr "指定影�的縮放比例 (尺寸)"
 
-#: src/gutenprintui/panel.c:1980 src/gutenprintui2/panel.c:1978
+#: src/gutenprintui/panel.c:1983 src/gutenprintui2/panel.c:1981
 msgid "Scale by:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:1985 src/gutenprintui2/panel.c:1983
+#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
 msgid ""
 "Select whether scaling is measured as percent of available page size or "
 "number of output dots per inch"
 msgstr "指定放大縮�影�時的單�，是��尺寸的百分比，還是�英�有多少點"
 
-#: src/gutenprintui/panel.c:1988 src/gutenprintui2/panel.c:1986
+#: src/gutenprintui/panel.c:1991 src/gutenprintui2/panel.c:1989
 msgid "Percent"
 msgstr "百分比"
 
-#: src/gutenprintui/panel.c:1993 src/gutenprintui2/panel.c:1991
+#: src/gutenprintui/panel.c:1996 src/gutenprintui2/panel.c:1994
 msgid "Scale the print to the size of the page"
 msgstr "指定列�時的影�尺寸為��尺寸的�個百分比"
 
-#: src/gutenprintui/panel.c:1997 src/gutenprintui2/panel.c:1995
+#: src/gutenprintui/panel.c:2000 src/gutenprintui2/panel.c:1998
 msgid "PPI"
 msgstr "PPI"
 
-#: src/gutenprintui/panel.c:2002 src/gutenprintui2/panel.c:2000
+#: src/gutenprintui/panel.c:2005 src/gutenprintui2/panel.c:2003
 msgid "Scale the print to the number of dots per inch"
 msgstr "列�時，��指定�英�有多少點來放大縮�影�"
 
-#: src/gutenprintui/panel.c:2020 src/gutenprintui2/panel.c:2018
+#: src/gutenprintui/panel.c:2023 src/gutenprintui2/panel.c:2021
 msgid "Set the width of the print"
 msgstr "指定列�時的影�寬度"
 
-#: src/gutenprintui/panel.c:2022 src/gutenprintui2/panel.c:2020
+#: src/gutenprintui/panel.c:2025 src/gutenprintui2/panel.c:2023
 msgid "Set the height of the print"
 msgstr "指定列�時的影�高度"
 
-#: src/gutenprintui/panel.c:2028 src/gutenprintui2/panel.c:2026
+#: src/gutenprintui/panel.c:2031 src/gutenprintui2/panel.c:2029
 msgid ""
 "Use Original\n"
 "Image Size"
@@ -4307,64 +4528,64 @@ msgstr ""
 "使用影�\n"
 "原來的尺寸"
 
-#: src/gutenprintui/panel.c:2034 src/gutenprintui2/panel.c:2032
+#: src/gutenprintui/panel.c:2037 src/gutenprintui2/panel.c:2035
 msgid "Set the print size to the size of the image"
 msgstr "將列�時的影�尺寸設定為影�原來的尺寸"
 
-#: src/gutenprintui/panel.c:2057 src/gutenprintui2/panel.c:2056
+#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
 msgid "Print Color Adjust"
 msgstr "列�色彩調整"
 
-#: src/gutenprintui/panel.c:2060 src/gutenprintui2/panel.c:2059
+#: src/gutenprintui/panel.c:2063 src/gutenprintui2/panel.c:2062
 msgid "Set Defaults"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2062 src/gutenprintui2/panel.c:2061
+#: src/gutenprintui/panel.c:2065 src/gutenprintui2/panel.c:2064
 msgid "Close"
 msgstr "關閉"
 
-#: src/gutenprintui/panel.c:2092 src/gutenprintui2/panel.c:2090
+#: src/gutenprintui/panel.c:2095 src/gutenprintui2/panel.c:2093
 msgid "Image preview"
 msgstr "影��覽"
 
-#: src/gutenprintui/panel.c:2106 src/gutenprintui2/panel.c:2104
+#: src/gutenprintui/panel.c:2109 src/gutenprintui2/panel.c:2107
 msgid "View Output Channels:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2170 src/gutenprintui2/panel.c:2174
+#: src/gutenprintui/panel.c:2194 src/gutenprintui2/panel.c:2198
 msgid "Output"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2198 src/gutenprintui2/panel.c:2202
+#: src/gutenprintui/panel.c:2222 src/gutenprintui2/panel.c:2226
 msgid "Output Type:"
 msgstr ""
 
-#: src/gutenprintui/panel.c:2202 src/gutenprintui2/panel.c:2206
+#: src/gutenprintui/panel.c:2226 src/gutenprintui2/panel.c:2230
 msgid "Select the desired output type"
 msgstr "指定輸出類型："
 
-#: src/gutenprintui/panel.c:2223 src/gutenprintui2/panel.c:2227
+#: src/gutenprintui/panel.c:2247 src/gutenprintui2/panel.c:2251
 msgid "Adjust Output..."
 msgstr "調整輸出�果..."
 
-#: src/gutenprintui/panel.c:2232 src/gutenprintui2/panel.c:2236
+#: src/gutenprintui/panel.c:2256 src/gutenprintui2/panel.c:2260
 msgid ""
 "Adjust color balance, brightness, contrast, saturation, and dither algorithm"
 msgstr "調整色彩平衡�光度��差�彩度�擬色的�算方�"
 
-#: src/gutenprintui/panel.c:2250 src/gutenprintui2/panel.c:2255
+#: src/gutenprintui/panel.c:2274 src/gutenprintui2/panel.c:2279
 msgid "Size Units:"
 msgstr "尺寸單�："
 
-#: src/gutenprintui/panel.c:2253 src/gutenprintui2/panel.c:2258
+#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
 msgid " "
 msgstr ""
 
-#: src/gutenprintui/panel.c:2277 src/gutenprintui2/panel.c:2282
+#: src/gutenprintui/panel.c:2301 src/gutenprintui2/panel.c:2306
 msgid "Units:"
 msgstr "單�："
 
-#: src/gutenprintui/panel.c:2282 src/gutenprintui2/panel.c:2287
+#: src/gutenprintui/panel.c:2306 src/gutenprintui2/panel.c:2311
 msgid "Select the base unit of measurement for printing"
 msgstr "指定列�時的基本長度單�"
 
@@ -4397,11 +4618,11 @@ msgstr "Berkeley lpd (/usr/libexec/lpc)"
 msgid "Berkeley lpd (/usr/sbin/lpc)"
 msgstr "Berkeley lpd (/usr/sbin/lpc)"
 
-#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:992
+#: src/gutenprintui/plist.c:996 src/gutenprintui2/plist.c:1009
 msgid "Printer"
 msgstr "�表機"
 
-#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1179
+#: src/gutenprintui/plist.c:1183 src/gutenprintui2/plist.c:1196
 msgid "(Default Printer)"
 msgstr "(�設�表機)"
 
@@ -4449,60 +4670,60 @@ msgstr ""
 msgid "_Gamma value"
 msgstr "_Gamma 值"
 
-#: src/cups/genppd.c:136
+#: src/cups/genppd.c:134
 msgid "Printer Features"
 msgstr "�表機功能"
 
-#: src/cups/genppd.c:137
+#: src/cups/genppd.c:135
 msgid "Output Control"
 msgstr ""
 
-#: src/cups/genppd.c:142
+#: src/cups/genppd.c:140
 msgid "Common"
 msgstr ""
 
-#: src/cups/genppd.c:143
+#: src/cups/genppd.c:141
 msgid "Extra 1"
 msgstr ""
 
-#: src/cups/genppd.c:144
+#: src/cups/genppd.c:142
 msgid "Extra 2"
 msgstr ""
 
-#: src/cups/genppd.c:145
+#: src/cups/genppd.c:143
 msgid "Extra 3"
 msgstr ""
 
-#: src/cups/genppd.c:146
+#: src/cups/genppd.c:144
 msgid "Extra 4"
 msgstr ""
 
-#: src/cups/genppd.c:147
+#: src/cups/genppd.c:145
 msgid "Extra 5"
 msgstr ""
 
 #. TRANSLATORS: "Gutenprint" is a proper name, not a description
-#: src/cups/genppd.c:192 src/cups/genppd.c:201
+#: src/cups/genppd.c:190 src/cups/genppd.c:199
 msgid "Gutenprint"
 msgstr "Gutenprint"
 
-#: src/cups/genppd.c:870
+#: src/cups/genppd.c:868
 msgid "English"
 msgstr ""
 
-#: src/cups/genppd.c:872
+#: src/cups/genppd.c:870
 msgid "ISOLatin1"
 msgstr ""
 
-#: src/cups/genppd.c:1419
+#: src/cups/genppd.c:1417
 msgid "No"
 msgstr "�"
 
-#: src/cups/genppd.c:1421
+#: src/cups/genppd.c:1419
 msgid "Yes"
 msgstr "是"
 
-#: src/cups/genppd.c:1449
+#: src/cups/genppd.c:1447
 msgid "Fine Adjustment"
 msgstr ""
 
@@ -4676,18 +4897,18 @@ msgstr ""
 msgid "Cannot read from %s: %s\n"
 msgstr "無法由 %s 讀�資料：%s\n"
 
-#: src/escputil/escputil.c:659 src/escputil/escputil.c:932
-#: src/escputil/escputil.c:1163
+#: src/escputil/escputil.c:659 src/escputil/escputil.c:934
+#: src/escputil/escputil.c:1147
 #, c-format
 msgid "Cannot open %s read/write: %s\n"
 msgstr ""
 
-#: src/escputil/escputil.c:677 src/escputil/escputil.c:1051
+#: src/escputil/escputil.c:677 src/escputil/escputil.c:1034
 #, c-format
 msgid "Cannot write to %s: %s\n"
 msgstr "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:733 src/escputil/escputil.c:1030
+#: src/escputil/escputil.c:733 src/escputil/escputil.c:1013
 #, c-format
 msgid ""
 "\n"
@@ -4696,7 +4917,7 @@ msgstr ""
 "\n"
 "無法寫入 %s：%s\n"
 
-#: src/escputil/escputil.c:739 src/escputil/escputil.c:1037
+#: src/escputil/escputil.c:739 src/escputil/escputil.c:1020
 #, c-format
 msgid ""
 "\n"
@@ -4711,81 +4932,82 @@ msgid ""
 "Please use -m to specify your printer model.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:871
-msgid "unknown"
-msgstr ""
+#: src/escputil/escputil.c:863 src/escputil/escputil.c:869
+#: src/escputil/escputil.c:870 src/escputil/escputil.c:982
+msgid "Unknown"
+msgstr "�詳"
 
-#: src/escputil/escputil.c:898
+#: src/escputil/escputil.c:900
 msgid "ink levels"
 msgstr ""
 
-#: src/escputil/escputil.c:901
+#: src/escputil/escputil.c:903
 msgid "status"
 msgstr "狀態"
 
-#: src/escputil/escputil.c:906
+#: src/escputil/escputil.c:908
 #, c-format
 msgid "Obtaining %s requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:915 src/escputil/escputil.c:1154
+#: src/escputil/escputil.c:917 src/escputil/escputil.c:1138
 #, c-format
 msgid "Cannot identify printer!\n"
 msgstr "無法識別�表機�\n"
 
-#: src/escputil/escputil.c:925
+#: src/escputil/escputil.c:927
 #, c-format
 msgid "Printer does not support listing ink types!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Ink color"
 msgstr "墨水�色"
 
-#: src/escputil/escputil.c:974 src/escputil/escputil.c:1088
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:976 src/escputil/escputil.c:1071
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Percent remaining"
 msgstr ""
 
-#: src/escputil/escputil.c:998
-msgid "Unknown"
-msgstr "�詳"
-
-#: src/escputil/escputil.c:1147
+#: src/escputil/escputil.c:1131
 #, c-format
 msgid "Obtaining extended ink information requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1201
+#: src/escputil/escputil.c:1192 src/escputil/escputil.c:1216
+#: src/escputil/escputil.c:1236
 msgid "Part number"
 msgstr ""
 
-#: src/escputil/escputil.c:1202
+#: src/escputil/escputil.c:1193 src/escputil/escputil.c:1217
+#: src/escputil/escputil.c:1237
 msgid "Date"
 msgstr "日期"
 
-#: src/escputil/escputil.c:1238
+#: src/escputil/escputil.c:1273
 #, c-format
 msgid "Printer identification requires using a raw device.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1254
+#: src/escputil/escputil.c:1289
 #, c-format
 msgid "Cannot identify printer model.\n"
 msgstr "無法識別�表機型號。\n"
 
-#: src/escputil/escputil.c:1273
+#: src/escputil/escputil.c:1308
 #, c-format
 msgid "Cleaning heads...\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1284
+#: src/escputil/escputil.c:1319
 #, c-format
 msgid "Running nozzle check, please ensure paper is in the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1288
+#: src/escputil/escputil.c:1323
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4824,7 +5046,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1323
+#: src/escputil/escputil.c:1358
 #, c-format
 msgid ""
 "Please read these instructions very carefully before proceeding.\n"
@@ -4860,12 +5082,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1367
+#: src/escputil/escputil.c:1402
 #, c-format
 msgid "Unable to send command to the printer, exiting.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1377
+#: src/escputil/escputil.c:1412
 #, c-format
 msgid ""
 "Please inspect the final output very carefully to ensure that your\n"
@@ -4877,38 +5099,38 @@ msgid ""
 "What do you want to do (s, q, r)?\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1385 src/escputil/escputil.c:1392
-#: src/escputil/escputil.c:1405 src/escputil/escputil.c:1421
-#: src/escputil/escputil.c:1523
+#: src/escputil/escputil.c:1420 src/escputil/escputil.c:1427
+#: src/escputil/escputil.c:1440 src/escputil/escputil.c:1456
+#: src/escputil/escputil.c:1558
 msgid "> "
 msgstr "> "
 
-#: src/escputil/escputil.c:1390
+#: src/escputil/escputil.c:1425
 #, c-format
 msgid ""
 "Please confirm by typing 'q' again that you wish to quit without saving:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1395
+#: src/escputil/escputil.c:1430
 #, c-format
 msgid ""
 "OK, your printer is aligned, but the alignment has not been saved.\n"
 "If you wish to save the alignment, you must repeat this process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1402
+#: src/escputil/escputil.c:1437
 #, c-format
 msgid ""
 "Please confirm by typing 'r' again that you wish to repeat the\n"
 "alignment process:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1408
+#: src/escputil/escputil.c:1443
 #, c-format
 msgid "Repeating the alignment process.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1414
+#: src/escputil/escputil.c:1449
 #, c-format
 msgid ""
 "This will permanently alter the configuration of your printer.\n"
@@ -4918,44 +5140,44 @@ msgid ""
 "to your printer:\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1424
+#: src/escputil/escputil.c:1459
 #, c-format
 msgid "About to save settings..."
 msgstr "準備儲存設定..."
 
-#: src/escputil/escputil.c:1430
+#: src/escputil/escputil.c:1465
 #, c-format
 msgid "failed!\n"
 msgstr "失敗�\n"
 
-#: src/escputil/escputil.c:1431
+#: src/escputil/escputil.c:1466
 #, c-format
 msgid ""
 "Your settings were not saved successfully.  You must repeat the\n"
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1435
+#: src/escputil/escputil.c:1470
 #, c-format
 msgid "succeeded!\n"
 msgstr "�功�\n"
 
-#: src/escputil/escputil.c:1436
+#: src/escputil/escputil.c:1471
 #, c-format
 msgid "Your alignment settings have been saved to the printer.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1441
+#: src/escputil/escputil.c:1476
 #, c-format
 msgid "Unrecognized command.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1444
+#: src/escputil/escputil.c:1479
 #, c-format
 msgid "Final command was not confirmed.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1449
+#: src/escputil/escputil.c:1484
 #, c-format
 msgid ""
 "This procedure assumes that your printer is an Epson %s.\n"
@@ -4966,12 +5188,12 @@ msgid ""
 "alignment procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1509 src/escputil/escputil.c:1531
-#: src/escputil/escputil.c:1574
+#: src/escputil/escputil.c:1544 src/escputil/escputil.c:1566
+#: src/escputil/escputil.c:1609
 msgid "Press enter to continue > "
 msgstr "請按 enter 繼續 > "
 
-#: src/escputil/escputil.c:1516
+#: src/escputil/escputil.c:1551
 #, c-format
 msgid ""
 "Please inspect the print, and choose the best pair of lines in each "
@@ -4979,42 +5201,42 @@ msgid ""
 "Type a pair number, '?' for help, or 'r' to repeat the procedure.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1522
+#: src/escputil/escputil.c:1557
 #, c-format
 msgid "Pass #%d"
 msgstr "第 %d 次"
 
-#: src/escputil/escputil.c:1528 src/escputil/escputil.c:1573
+#: src/escputil/escputil.c:1563 src/escputil/escputil.c:1608
 #, c-format
 msgid "Please insert a fresh sheet of paper.\n"
 msgstr "請放入白紙。\n"
 
-#: src/escputil/escputil.c:1547
+#: src/escputil/escputil.c:1582
 #, c-format
 msgid "Number out of range!\n"
 msgstr "數字超出範�以外�\n"
 
-#: src/escputil/escputil.c:1552
+#: src/escputil/escputil.c:1587
 #, c-format
 msgid "I cannot understand what you typed!\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1558
+#: src/escputil/escputil.c:1593
 #, c-format
 msgid "The best pair of lines should be numbered between 1 and %d.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1565
+#: src/escputil/escputil.c:1600
 #, c-format
 msgid "Attempting to set alignment..."
 msgstr ""
 
-#: src/escputil/escputil.c:1568
+#: src/escputil/escputil.c:1603
 #, c-format
 msgid "succeeded.\n"
 msgstr "�功。\n"
 
-#: src/escputil/escputil.c:1569
+#: src/escputil/escputil.c:1604
 #, c-format
 msgid ""
 "Please verify that the alignment is correct.  After the alignment pattern\n"
@@ -5023,7 +5245,7 @@ msgid ""
 "quality printing.\n"
 msgstr ""
 
-#: src/escputil/escputil.c:1615
+#: src/escputil/escputil.c:1650
 #, c-format
 msgid "Error in input\n"
 msgstr ""
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 058f220..9542463 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2003/01/01 21:06:03 rleigh Exp $
+## $Id: Makefile.am,v 1.6 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/samples/Makefile.in b/samples/Makefile.in
index 28d3239..5e8f1af 100644
--- a/samples/Makefile.in
+++ b/samples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -54,6 +54,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -68,8 +70,6 @@ DATA = $(pkgsampledata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -107,7 +107,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -120,14 +119,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -262,13 +259,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -314,8 +306,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 pkgsampledatadir = $(datadir)/$(PACKAGE)/samples
 @INSTALL_SAMPLES_TRUE@pkgsampledata_DATA = colorbars4.png colorsweep.png profile.jpg
@@ -333,9 +323,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  samples/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps samples/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  samples/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps samples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index d6bf588..8fab2c5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-## $Id: Makefile.am,v 1.4 2004/09/17 18:38:09 rleigh Exp $
+## $Id: Makefile.am,v 1.5 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -18,12 +18,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.5 dist-bzip2 check-news gnu no-dependencies 
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 628cbfa..9c9e1b9 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -39,7 +39,7 @@ build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(top_srcdir)/scripts/global.mk compile config.guess \
-	config.rpath config.sub depcomp install-sh ltmain.sh missing \
+	config.rpath config.sub install-sh ltmain.sh missing \
 	mkinstalldirs
 subdir = scripts
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -62,8 +62,6 @@ DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -101,7 +99,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -114,14 +111,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -256,13 +251,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -308,8 +298,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.5 dist-bzip2 check-news gnu no-dependencies 
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 
 # The autotools-installed scripts /should/ be automatically distributed.
@@ -333,9 +321,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  scripts/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps scripts/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  scripts/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps scripts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/scripts/compile b/scripts/compile
index ad57e2f..1b1d232 100755
--- a/scripts/compile
+++ b/scripts/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-02-03.08
+scriptversion=2005-05-14.22
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
@@ -18,7 +18,7 @@ scriptversion=2005-02-03.08
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
diff --git a/scripts/config.guess b/scripts/config.guess
index 44f30e6..ad5281e 100755
--- a/scripts/config.guess
+++ b/scripts/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-02-10'
+timestamp='2005-08-03'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ timestamp='2005-02-10'
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
@@ -66,11 +68,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -123,7 +125,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
 	;;
  ,,*)   CC_FOR_BUILD=$CC ;;
  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -136,16 +138,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -206,55 +198,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -307,40 +264,43 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
+	exit ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
 	# of the specific Alpha model?
 	echo alpha-pc-interix
-	exit 0 ;;
+	exit ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
-	exit 0 ;;
+	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-unknown-sysv4
-	exit 0;;
+	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
+	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)
 	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
+	exit ;;
     *:OS/390:*:*)
 	echo i370-ibm-openedition
-	exit 0 ;;
+	exit ;;
     *:z/VM:*:*)
 	echo s390-ibm-zvmoe
-	exit 0 ;;
+	exit ;;
     *:OS400:*:*)
         echo powerpc-ibm-os400
-	exit 0 ;;
+	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
+	exit ;;
+    arm:riscos:*:*|arm:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
+	exit ;;
     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -348,32 +308,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	else
 		echo pyramid-pyramid-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
-	exit 0 ;;
+	exit ;;
     DRS?6000:unix:4.0:6*)
 	echo sparc-icl-nx6
-	exit 0 ;;
+	exit ;;
     DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
 	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     i86pc:SunOS:5.*:*)
 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
 	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
 	# it's likely to be more like Solaris than SunOS4.
 	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     sun4*:SunOS:*:*)
 	case "`/usr/bin/arch -k`" in
 	    Series*|S4*)
@@ -382,10 +342,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	esac
 	# Japanese Language versions have a version number like `4.1.3-JL'.
 	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
+	exit ;;
     sun3*:SunOS:*:*)
 	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -397,10 +357,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		echo sparc-sun-sunos${UNAME_RELEASE}
 		;;
 	esac
-	exit 0 ;;
+	exit ;;
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     # The situation for MiNT is a little confusing.  The machine name
     # can be virtually everything (everything which is not
     # "atarist" or "atariste" at least should have a processor
@@ -411,40 +371,40 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
         echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
         echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
         echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
+        exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RISC*:Mach:*:*)
 	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
+	exit ;;
     RISC*:ULTRIX:*:*)
 	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -468,32 +428,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	  exit (-1);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
 	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Motorola:PowerMAX_OS:*:*)
 	echo powerpc-motorola-powermax
-	exit 0 ;;
+	exit ;;
     Motorola:*:4.3:PL8-*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 	echo powerpc-harris-powermax
-	exit 0 ;;
+	exit ;;
     Night_Hawk:Power_UNIX:*:*)
 	echo powerpc-harris-powerunix
-	exit 0 ;;
+	exit ;;
     m88k:CX/UX:7*:*)
 	echo m88k-harris-cxux7
-	exit 0 ;;
+	exit ;;
     m88k:*:4*:R4*)
 	echo m88k-motorola-sysv4
-	exit 0 ;;
+	exit ;;
     m88k:*:3*:R3*)
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -509,29 +470,29 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit 0 ;;
+ 	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
-	exit 0 ;;
+	exit ;;
     M88*:*:R3*:*)
 	# Delta 88k system running SVR3
 	echo m88k-motorola-sysv3
-	exit 0 ;;
+	exit ;;
     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 	echo m88k-tektronix-sysv3
-	exit 0 ;;
+	exit ;;
     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 	echo m68k-tektronix-bsd
-	exit 0 ;;
+	exit ;;
     *:IRIX*:*:*)
 	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
+	exit ;;
     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
     i*86:AIX:*:*)
 	echo i386-ibm-aix
-	exit 0 ;;
+	exit ;;
     ia64:AIX:*:*)
 	if [ -x /usr/bin/oslevel ] ; then
 		IBM_REV=`/usr/bin/oslevel`
@@ -539,7 +500,7 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
 		eval $set_cc_for_build
@@ -554,14 +515,18 @@ EOF
 			exit(0);
 			}
 EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
 	else
 		echo rs6000-ibm-aix3.2
 	fi
-	exit 0 ;;
+	exit ;;
     *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -575,28 +540,28 @@ EOF
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
+	exit ;;
     *:AIX:*:*)
 	echo rs6000-ibm-aix
-	exit 0 ;;
+	exit ;;
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
-	exit 0 ;;
+	exit ;;
     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
+	exit ;;                             # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
 	echo rs6000-bull-bosx
-	exit 0 ;;
+	exit ;;
     DPX/2?00:B.O.S.:*:*)
 	echo m68k-bull-sysv3
-	exit 0 ;;
+	exit ;;
     9000/[34]??:4.3bsd:1.*:*)
 	echo m68k-hp-bsd
-	exit 0 ;;
+	exit ;;
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
-	exit 0 ;;
+	exit ;;
     9000/[34678]??:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	case "${UNAME_MACHINE}" in
@@ -658,9 +623,19 @@ EOF
 	esac
 	if [ ${HP_ARCH} = "hppa2.0w" ]
 	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -668,11 +643,11 @@ EOF
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     ia64:HP-UX:*:*)
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
+	exit ;;
     3050*:HI-UX:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -700,161 +675,166 @@ EOF
 	  exit (0);
 	}
 EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
 	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
+	exit ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 	echo hppa1.1-hp-bsd
-	exit 0 ;;
+	exit ;;
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
-	exit 0 ;;
+	exit ;;
     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 	echo hppa1.0-hp-mpeix
-	exit 0 ;;
+	exit ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
-	exit 0 ;;
+	exit ;;
     hp8??:OSF1:*:*)
 	echo hppa1.0-hp-osf
-	exit 0 ;;
+	exit ;;
     i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
 	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
 	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
-	exit 0 ;;
+	exit ;;
     parisc*:Lites*:*:*)
 	echo hppa1.1-hp-lites
-	exit 0 ;;
+	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit 0 ;;
+        exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit 0 ;;
+        exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit 0 ;;
+        exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit 0 ;;
+        exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit 0 ;;
+        exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*[A-Z]90:*:*:*)
 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
 	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*TS:*:*:*)
 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*T3E:*:*:*)
 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     CRAY*SV1:*:*:*)
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     *:UNICOS/mp:*:*)
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
+	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
+        exit ;;
     5000:UNIX_System_V:4.*:*)
         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
+	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     sparc*:BSD/OS:*:*)
 	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:FreeBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
+	exit ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
+	exit ;;
+    i*:windows32*:*)
+    	# uname -m includes "-pc" on this system.
+    	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
+	exit ;;
     x86:Interix*:[34]*)
 	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
+	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i586-pc-interix
-	exit 0 ;;
+	exit ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    amd64:CYGWIN*:*:*)
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     p*:CYGWIN*:*)
 	echo powerpcle-unknown-cygwin
-	exit 0 ;;
+	exit ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
+	exit ;;
     *:GNU:*:*)
 	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
+	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
 	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
+	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
+	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux
-	exit 0 ;;
+	echo cris-axis-linux-gnu
+	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux
-	exit 0 ;;
+	echo crisv32-axis-linux-gnu
+	exit ;;
     frv:Linux:*:*)
-    	echo frv-${VENDOR}-linux
-	exit 0 ;;
+    	echo frv-unknown-linux-gnu
+	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
@@ -872,7 +852,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -891,14 +871,17 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux
-	exit 0 ;;
+	echo powerpc-unknown-linux-gnu
+	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux
-	exit 0 ;;
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -910,35 +893,35 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
-	exit 0 ;;
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
-	  *)    echo hppa-${VENDOR}-linux ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
-	exit 0 ;;
+	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux
-	exit 0 ;;
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
+	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
-	exit 0 ;;
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux
-	exit 0 ;;
+	echo x86_64-unknown-linux-gnu
+	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
@@ -952,19 +935,19 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
-		exit 0 ;;
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
-		exit 0 ;;
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit ;;
 	  "")
-		# Either a pre-BFD a.out linker (linuxoldld) or
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
-		exit 0 ;;
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -992,15 +975,18 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+	test x"${LIBC}" != x && {
+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+		exit
+	}
+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
 	# sysname and nodename.
 	echo i386-sequent-sysv4
-	exit 0 ;;
+	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
         # Unixware is an offshoot of SVR4, but it has its own version
         # number series starting with 2...
@@ -1008,27 +994,27 @@ EOF
 	# I just have to hope.  -- rms.
         # Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:OS/2:*:*)
 	# If we were able to find `uname', then EMX Unix compatibility
 	# is probably installed.
 	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
+	exit ;;
     i*86:XTS-300:*:STOP)
 	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
+	exit ;;
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
+	exit ;;
+    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
+	exit ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
+	exit ;;
     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1036,15 +1022,16 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
+	exit ;;
+    i*86:*:5:[678]*)
+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
 	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
+	exit ;;
     i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1062,73 +1049,73 @@ EOF
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
-	exit 0 ;;
+	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
-        exit 0 ;;
+        exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
-	exit 0 ;;
+	exit ;;
     paragon:*:*:*)
 	echo i860-intel-osf1
-	exit 0 ;;
+	exit ;;
     i860:*:4.*:*) # i860-SVR4
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
 	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
-	exit 0 ;;
+	exit ;;
     mini*:CTIX:SYS*5:*)
 	# "miniframe"
 	echo m68010-convergent-sysv
-	exit 0 ;;
+	exit ;;
     mc68k:UNIX:SYSTEM5:3.51m)
 	echo m68k-convergent-sysv
-	exit 0 ;;
+	exit ;;
     M680?0:D-NIX:5.3:*)
 	echo m68k-diab-dnix
-	exit 0 ;;
+	exit ;;
     M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
 	OS_REL=''
 	test -r /etc/.relid \
 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
+          && { echo i486-ncr-sysv4; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
-	exit 0 ;;
+	exit ;;
     TSUNAMI:LynxOS:2.*:*)
 	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     RM*:ReliantUNIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
-	exit 0 ;;
+	exit ;;
     *:SINIX-*:*:*)
 	if uname -p 2>/dev/null >/dev/null ; then
 		UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1136,61 +1123,65 @@ EOF
 	else
 		echo ns32k-sni-sysv
 	fi
-	exit 0 ;;
+	exit ;;
     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                       # says <Richard.M.Bartel@ccMail.Census.GOV>
         echo i586-unisys-sysv4
-        exit 0 ;;
+        exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
 	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
+	exit ;;
     *:*:*:FTX*)
 	# From seanf@swdc.stratus.com.
 	echo i860-stratus-sysv4
-	exit 0 ;;
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
     *:VOS:*:*)
 	# From Paul.Green@stratus.com.
 	echo hppa1.1-stratus-vos
-	exit 0 ;;
+	exit ;;
     mc68*:A/UX:*:*)
 	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     news*:NEWS-OS:6*:*)
 	echo mips-sony-newsos6
-	exit 0 ;;
+	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
 	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit 0 ;;
+        exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
-	exit 0 ;;
+	exit ;;
     BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 	echo powerpc-apple-beos
-	exit 0 ;;
+	exit ;;
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
-	exit 0 ;;
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-5:SUPER-UX:*:*)
 	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
@@ -1198,7 +1189,7 @@ EOF
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
 	if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1206,25 +1197,25 @@ EOF
 		UNAME_MACHINE=pc
 	fi
 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:QNX:*:4*)
 	echo i386-pc-qnx
-	exit 0 ;;
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
-	exit 0 ;;
+	exit ;;
     BS2000:POSIX*:*:*)
 	echo bs2000-siemens-sysv
-	exit 0 ;;
+	exit ;;
     DS/*:UNIX_System_V:*:*)
 	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:Plan9:*:*)
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
@@ -1235,41 +1226,44 @@ EOF
 	    UNAME_MACHINE="$cputype"
 	fi
 	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
+	exit ;;
     *:TOPS-10:*:*)
 	echo pdp10-unknown-tops10
-	exit 0 ;;
+	exit ;;
     *:TENEX:*:*)
 	echo pdp10-unknown-tenex
-	exit 0 ;;
+	exit ;;
     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
-	exit 0 ;;
+	exit ;;
     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 	echo pdp10-xkl-tops20
-	exit 0 ;;
+	exit ;;
     *:TOPS-20:*:*)
 	echo pdp10-unknown-tops20
-	exit 0 ;;
+	exit ;;
     *:ITS:*:*)
 	echo pdp10-unknown-its
-	exit 0 ;;
+	exit ;;
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
+	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
+	exit ;;
     *:*VMS:*:*)
     	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
 	esac ;;
     *:XENIX:*:SysV)
 	echo i386-pc-xenix
-	exit 0 ;;
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1301,7 +1295,7 @@ main ()
 #endif
 
 #if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
+  printf ("arm-acorn-riscix\n"); exit (0);
 #endif
 
 #if defined (hp300) && !defined (hpux)
@@ -1390,11 +1384,12 @@ main ()
 }
 EOF
 
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+	{ echo "$SYSTEM_NAME"; exit; }
 
 # Apollos put the system type in the environment.
 
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
 
 # Convex versions that predate uname can use getsysinfo(1)
 
@@ -1403,22 +1398,22 @@ then
     case `getsysinfo -f cpu_type` in
     c1*)
 	echo c1-convex-bsd
-	exit 0 ;;
+	exit ;;
     c2*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-	exit 0 ;;
+	exit ;;
     c34*)
 	echo c34-convex-bsd
-	exit 0 ;;
+	exit ;;
     c38*)
 	echo c38-convex-bsd
-	exit 0 ;;
+	exit ;;
     c4*)
 	echo c4-convex-bsd
-	exit 0 ;;
+	exit ;;
     esac
 fi
 
@@ -1429,7 +1424,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-    ftp://ftp.gnu.org/pub/gnu/config/
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/scripts/config.sub b/scripts/config.sub
index c884ad4..1c366df 100755
--- a/scripts/config.sub
+++ b/scripts/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-timestamp='2005-02-10'
+timestamp='2005-07-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,14 +21,15 @@ timestamp='2005-02-10'
 #
 # 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.
 #
@@ -83,11 +84,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
+       echo "$timestamp" ; exit ;;
     --version | -v )
-       echo "$version" ; exit 0 ;;
+       echo "$version" ; exit ;;
     --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
+       echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
@@ -99,7 +100,7 @@ while test $# -gt 0 ; do
     *local*)
        # First pass through any local machine types.
        echo $1
-       exit 0;;
+       exit ;;
 
     * )
        break ;;
@@ -231,6 +232,7 @@ case $basic_machine in
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
@@ -246,6 +248,7 @@ case $basic_machine in
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
@@ -254,15 +257,17 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| ms1 \
 	| msp430 \
 	| ns16k | ns32k \
-	| openrisc | or32 \
+	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b \
 	| strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
@@ -271,6 +276,9 @@ case $basic_machine in
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
+	m32c)
+		basic_machine=$basic_machine-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -298,7 +306,7 @@ case $basic_machine in
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* \
-	| bs2000-* \
+	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
@@ -319,6 +327,7 @@ case $basic_machine in
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
@@ -327,6 +336,7 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
+	| ms1-* \
 	| msp430-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
@@ -334,9 +344,10 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -348,6 +359,8 @@ case $basic_machine in
 	| ymp-* \
 	| z8k-*)
 		;;
+	m32c-*)
+		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -758,9 +771,8 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	or32 | or32-*)
+	openrisc | openrisc-*)
 		basic_machine=or32-unknown
-		os=-coff
 		;;
 	os400)
 		basic_machine=powerpc-ibm
@@ -1086,12 +1098,9 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
@@ -1172,13 +1181,14 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1196,7 +1206,7 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
@@ -1205,6 +1215,9 @@ case $os in
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1382,6 +1395,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
+	*-haiku)
+		os=-haiku
+		;;
 	*-ibm)
 		os=-aix
 		;;
@@ -1553,7 +1569,7 @@ case $basic_machine in
 esac
 
 echo $basic_machine$os
-exit 0
+exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/scripts/depcomp b/scripts/depcomp
deleted file mode 100755
index ffcd540..0000000
--- a/scripts/depcomp
+++ /dev/null
@@ -1,529 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-02-09.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# 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, 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.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/scripts/install-sh b/scripts/install-sh
index 1a83534..4d4a951 100755
--- a/scripts/install-sh
+++ b/scripts/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-02-02.21
+scriptversion=2005-05-14.22
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
diff --git a/scripts/ltmain.sh b/scripts/ltmain.sh
index 5eb4c3a..db4982d 100644
--- a/scripts/ltmain.sh
+++ b/scripts/ltmain.sh
@@ -1,7 +1,7 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -17,13 +17,41 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION="1.5.20 Debian 1.5.20-2"
+TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)"
+
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes.
+if test -n "${ZSH_VERSION+set}" ; then
+  setopt NO_GLOB_SUBST
+fi
+
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
   # Discard the --no-reexec flag, and continue.
@@ -36,7 +64,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
   :
 else
   # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
 fi
 
 if test "X$1" = X--fallback-echo; then
@@ -45,19 +73,9 @@ if test "X$1" = X--fallback-echo; then
   cat <<EOF
 $*
 EOF
-  exit 0
+  exit $EXIT_SUCCESS
 fi
 
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.2
-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08)"
-
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
@@ -70,14 +88,15 @@ rm="rm -f"
 Xsed="${SED}"' -e 1s/^X//'
 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
 # test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  SP2NL='tr \040 \012'
+  NL2SP='tr \015\012 \040\040'
   ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
+ *) # EBCDIC based system
+  SP2NL='tr \100 \n'
+  NL2SP='tr \r\n \100\100'
   ;;
 esac
 
@@ -94,13 +113,14 @@ if test "${LANG+set}" = set; then
 fi
 
 # Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
+lt_nl='
+'
+IFS=" 	$lt_nl"
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
   $echo "$modename: not configured to build any kind of library" 1>&2
   $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # Global variables.
@@ -119,10 +139,14 @@ o2lo="s/\\.${objext}\$/.lo/"
 # Shell function definitions:
 # This seems to be the best place for them
 
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
-win32_libid () {
+func_win32_libid ()
+{
   win32_libid_type="unknown"
   win32_fileres=`file -L $1 2>/dev/null`
   case $win32_fileres in
@@ -131,7 +155,7 @@ win32_libid () {
     ;;
   *ar\ archive*) # could be an import, or static
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
 	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
       if test "X$win32_nmres" = "Ximport" ; then
@@ -141,7 +165,7 @@ win32_libid () {
       fi
     fi
     ;;
-  *DLL*) 
+  *DLL*)
     win32_libid_type="x86 DLL"
     ;;
   *executable*) # but shell scripts are "executable" too...
@@ -155,9 +179,179 @@ win32_libid () {
   $echo $win32_libid_type
 }
 
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag ()
+{
+    if test -n "$available_tags" && test -z "$tagname"; then
+      CC_quoted=
+      for arg in $CC; do
+	case $arg in
+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	  arg="\"$arg\""
+	  ;;
+	esac
+	CC_quoted="$CC_quoted $arg"
+      done
+      case $@ in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+	    CC_quoted=
+	    for arg in $CC; do
+	    # Double-quote args containing other shell metacharacters.
+	    case $arg in
+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	      arg="\"$arg\""
+	      ;;
+	    esac
+	    CC_quoted="$CC_quoted $arg"
+	  done
+	    case "$@ " in
+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+	      # The compiler in the base compile command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit $EXIT_FAILURE
+#        else
+#          $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+}
+
+
+# func_extract_an_archive dir oldlib
+func_extract_an_archive ()
+{
+    f_ex_an_ar_dir="$1"; shift
+    f_ex_an_ar_oldlib="$1"
+
+    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
+    $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
+    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+     :
+    else
+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      exit $EXIT_FAILURE
+    fi
+}
+
+# func_extract_archives gentop oldlib ...
+func_extract_archives ()
+{
+    my_gentop="$1"; shift
+    my_oldlibs=${1+"$@"}
+    my_oldobjs=""
+    my_xlib=""
+    my_xabs=""
+    my_xdir=""
+    my_status=""
+
+    $show "${rm}r $my_gentop"
+    $run ${rm}r "$my_gentop"
+    $show "$mkdir $my_gentop"
+    $run $mkdir "$my_gentop"
+    my_status=$?
+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
+      exit $my_status
+    fi
+
+    for my_xlib in $my_oldlibs; do
+      # Extract the objects.
+      case $my_xlib in
+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+	*) my_xabs=`pwd`"/$my_xlib" ;;
+      esac
+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
+      my_xdir="$my_gentop/$my_xlib"
+
+      $show "${rm}r $my_xdir"
+      $run ${rm}r "$my_xdir"
+      $show "$mkdir $my_xdir"
+      $run $mkdir "$my_xdir"
+      status=$?
+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
+	exit $status
+      fi
+      case $host in
+      *-darwin*)
+	$show "Extracting $my_xabs"
+	# Do not bother doing anything if just a dry run
+	if test -z "$run"; then
+	  darwin_orig_dir=`pwd`
+	  cd $my_xdir || exit $?
+	  darwin_archive=$my_xabs
+	  darwin_curdir=`pwd`
+	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
+	  if test -n "$darwin_arches"; then 
+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
+	    darwin_arch=
+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
+	    for darwin_arch in  $darwin_arches ; do
+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+	      cd "$darwin_curdir"
+	      $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+	    done # $darwin_arches
+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
+	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
+	    darwin_file=
+	    darwin_files=
+	    for darwin_file in $darwin_filelist; do
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      lipo -create -output "$darwin_file" $darwin_files
+	    done # $darwin_filelist
+	    ${rm}r unfat-$$
+	    cd "$darwin_orig_dir"
+	  else
+	    cd "$darwin_orig_dir"
+ 	    func_extract_an_archive "$my_xdir" "$my_xabs"
+	  fi # $darwin_arches
+	fi # $run
+	;;
+      *)
+        func_extract_an_archive "$my_xdir" "$my_xabs"
+        ;;
+      esac
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+    done
+    func_extract_archives_result="$my_oldobjs"
+}
 # End of Shell function definitions
 #####################################
 
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
 # Parse our command line options once, thoroughly.
 while test "$#" -gt 0
 do
@@ -183,7 +377,7 @@ do
       case $tagname in
       *[!-_A-Za-z0-9,/]*)
 	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
+	exit $EXIT_FAILURE
 	;;
       esac
 
@@ -193,10 +387,10 @@ do
 	# not specially marked.
 	;;
       *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
 	  taglist="$taglist $tagname"
 	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
 	else
 	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
 	fi
@@ -222,19 +416,19 @@ do
   --version)
     $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
     $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
     $echo "This is free software; see the source for copying conditions.  There is NO"
     $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
+    exit $?
     ;;
 
   --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
     # Now print the configurations for the tags.
     for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
     done
-    exit 0
+    exit $?
     ;;
 
   --debug)
@@ -259,7 +453,7 @@ do
     else
       $echo "disable static libraries"
     fi
-    exit 0
+    exit $?
     ;;
 
   --finish) mode="finish" ;;
@@ -290,7 +484,7 @@ do
   -*)
     $echo "$modename: unrecognized option \`$arg'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
 
   *)
@@ -303,7 +497,7 @@ done
 if test -n "$prevopt"; then
   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # If this variable is set in any of the actions, the command in it
@@ -316,7 +510,7 @@ if test -z "$show_help"; then
   # Infer the operation mode.
   if test -z "$mode"; then
     $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
     case $nonopt in
     *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
       mode=link
@@ -359,7 +553,7 @@ if test -z "$show_help"; then
   if test -n "$execute_dlfiles" && test "$mode" != execute; then
     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
     $echo "$help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 
   # Change the help message to a mode-specific one.
@@ -382,7 +576,7 @@ if test -z "$show_help"; then
 
     for arg
     do
-      case "$arg_mode" in
+      case $arg_mode in
       arg  )
 	# do not "continue".  Instead, add this to base_compile
 	lastarg="$arg"
@@ -401,7 +595,7 @@ if test -z "$show_help"; then
 	-o)
 	  if test -n "$libobj" ; then
 	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  arg_mode=target
 	  continue
@@ -426,7 +620,7 @@ if test -z "$show_help"; then
 	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
 	  lastarg=
 	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
+ 	  for arg in $args; do
 	    IFS="$save_ifs"
 
 	    # Double-quote args containing other shell metacharacters.
@@ -464,7 +658,10 @@ if test -z "$show_help"; then
       case $lastarg in
       # Double-quote args containing other shell metacharacters.
       # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
+      # in scan sets, and some SunOS ksh mistreat backslash-escaping
+      # in scan sets (worked around with variable expansion),
+      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
+      # at all, so we specify them separately.
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	lastarg="\"$lastarg\""
 	;;
@@ -476,11 +673,11 @@ if test -z "$show_help"; then
     case $arg_mode in
     arg)
       $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     target)
       $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     *)
       # Get the name of the library object.
@@ -513,50 +710,11 @@ if test -z "$show_help"; then
     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
     *)
       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     esac
 
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
+    func_infer_tag $base_compile
 
     for arg in $later; do
       case $arg in
@@ -577,6 +735,14 @@ if test -z "$show_help"; then
       esac
     done
 
+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+    case $qlibobj in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+	qlibobj="\"$qlibobj\"" ;;
+    esac
+    test "X$libobj" != "X$qlibobj" \
+	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
+	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" = "X$obj"; then
@@ -589,7 +755,7 @@ if test -z "$show_help"; then
     if test -z "$base_compile"; then
       $echo "$modename: you must specify a compilation command" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Delete any leftover library objects.
@@ -600,7 +766,7 @@ if test -z "$show_help"; then
     fi
 
     $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
 
     # On Cygwin there's no "real" PIC flag so we must build both object types
     case $host_os in
@@ -619,7 +785,7 @@ if test -z "$show_help"; then
       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
       removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
     else
       output_obj=
       need_locks=no
@@ -629,7 +795,7 @@ if test -z "$show_help"; then
     # Lock this critical section if it is needed
     # We use this script file to make the link, it avoids creating a new file
     if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
 	$show "Waiting for $lockfile to be removed"
 	sleep 2
       done
@@ -647,14 +813,19 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
-      $echo $srcfile > "$lockfile"
+      $echo "$srcfile" > "$lockfile"
     fi
 
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+    case $qsrcfile in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+      qsrcfile="\"$qsrcfile\"" ;;
+    esac
 
     $run $rm "$libobj" "${libobj}T"
 
@@ -676,10 +847,10 @@ EOF
       fbsd_hideous_sh_bug=$base_compile
 
       if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
+	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       fi
 
       if test ! -d "${xdir}$objdir"; then
@@ -702,7 +873,7 @@ EOF
       if $run eval "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       if test "$need_locks" = warn &&
@@ -722,7 +893,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed, then go on to compile the next one
@@ -759,9 +930,9 @@ EOF
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       else
-	command="$base_compile $srcfile $pic_flag"
+	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
 	command="$command -o $obj"
@@ -774,7 +945,7 @@ EOF
       if $run eval "$command"; then :
       else
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       if test "$need_locks" = warn &&
@@ -794,7 +965,7 @@ avoid parallel builds (make -j) in this platform, or get a better
 compiler."
 
 	$run $rm $removelist
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       # Just move the object if needed
@@ -832,7 +1003,7 @@ EOF
       $run $rm "$lockfile"
     fi
 
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool link mode
@@ -904,46 +1075,7 @@ EOF
     vinfo=
     vinfo_number=no
 
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
+    func_infer_tag $base_compile
 
     # We need to know -static, to get the right output filenames.
     for arg
@@ -1039,7 +1171,7 @@ EOF
 	  export_symbols="$arg"
 	  if test ! -f "$arg"; then
 	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  prev=
 	  continue
@@ -1091,7 +1223,7 @@ EOF
 		   test "$pic_object" = none && \
 		   test "$non_pic_object" = none; then
 		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit 1
+		  exit $EXIT_FAILURE
 		fi
 
 		# Extract subdirectory from the argument.
@@ -1144,7 +1276,7 @@ EOF
 		# Only an error if not doing a dry-run.
 		if test -z "$run"; then
 		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit 1
+		  exit $EXIT_FAILURE
 		else
 		  # Dry-run case.
 
@@ -1165,7 +1297,7 @@ EOF
 	    done
 	  else
 	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  arg=$save_arg
 	  prev=
@@ -1177,7 +1309,7 @@ EOF
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 	  *)
 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	  if test "$prev" = rpath; then
@@ -1217,6 +1349,18 @@ EOF
 	  finalize_command="$finalize_command $qarg"
 	  continue
 	  ;;
+	shrext)
+  	  shrext_cmds="$arg"
+	  prev=
+	  continue
+	  ;;
+        darwin_framework)
+	  compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
+	  prev=
+	  continue
+	  ;;
 	*)
 	  eval "$prev=\"\$arg\""
 	  prev=
@@ -1265,7 +1409,7 @@ EOF
       -export-symbols | -export-symbols-regex)
 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	if test "X$arg" = "X-export-symbols"; then
 	  prev=expsyms
@@ -1275,6 +1419,14 @@ EOF
 	continue
 	;;
 
+      -framework|-arch)
+        prev=darwin_framework
+        compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+        continue
+        ;;
+
       -inst-prefix-dir)
 	prev=inst_prefix
 	continue
@@ -1301,7 +1453,7 @@ EOF
 	  absdir=`cd "$dir" && pwd`
 	  if test -z "$absdir"; then
 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  dir="$absdir"
 	  ;;
@@ -1335,7 +1487,7 @@ EOF
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
@@ -1346,7 +1498,7 @@ EOF
 	  esac
 	elif test "X$arg" = "X-lc_r"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
+	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -1356,8 +1508,20 @@ EOF
 	continue
 	;;
 
+      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+      # classes, name mangling, and exception handling.
+      -model)
+	compile_command="$compile_command $arg"
+	compiler_flags="$compiler_flags $arg"
+	finalize_command="$finalize_command $arg"
+	prev=xcompiler
+	continue
+	;;
+
      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	deplibs="$deplibs $arg"
+	compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
 	continue
 	;;
 
@@ -1366,13 +1530,14 @@ EOF
 	continue
 	;;
 
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
+      # +DA*, +DD* enable 64-bit mode on the HP compiler
+      # -q* pass through compiler args for the IBM compiler
+      # -m* pass through architecture-specific compiler args for GCC
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*)
+
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
 	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
@@ -1452,7 +1617,7 @@ EOF
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
 	*)
 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 	case "$xrpath " in
@@ -1575,7 +1740,7 @@ EOF
 	     test "$pic_object" = none && \
 	     test "$non_pic_object" = none; then
 	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 
 	  # Extract subdirectory from the argument.
@@ -1628,7 +1793,7 @@ EOF
 	  # Only an error if not doing a dry-run.
 	  if test -z "$run"; then
 	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  else
 	    # Dry-run case.
 
@@ -1695,7 +1860,7 @@ EOF
     if test -n "$prev"; then
       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
@@ -1739,7 +1904,7 @@ EOF
     "")
       $echo "$modename: you must specify an output file" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
       ;;
     *.$libext) linkmode=oldlib ;;
     *.lo | *.$objext) linkmode=obj ;;
@@ -1749,7 +1914,7 @@ EOF
 
     case $host in
     *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
+      # don't eliminate duplications in $postdeps and $predeps
       duplicate_compiler_generated_deps=yes
       ;;
     *)
@@ -1802,7 +1967,7 @@ EOF
 	  *.la) ;;
 	  *)
 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	    ;;
 	  esac
 	done
@@ -1828,7 +1993,10 @@ EOF
 	case $pass in
 	dlopen) libs="$dlfiles" ;;
 	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+	link)
+	  libs="$deplibs %DEPLIBS%"
+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+	  ;;
 	esac
       fi
       if test "$pass" = dlopen; then
@@ -1845,7 +2013,7 @@ EOF
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    deplibs="$deplib $deplibs"
+	    compiler_flags="$compiler_flags $deplib"
 	  fi
 	  continue
 	  ;;
@@ -1854,13 +2022,9 @@ EOF
 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
 	    continue
 	  fi
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $shrext .so .a; do
+	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
 	      if test -f "$lib"; then
@@ -1936,11 +2100,11 @@ EOF
 	    fi
 	    if test "$pass" = scan; then
 	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    else
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
 	    ;;
 	  *)
 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
@@ -1968,7 +2132,22 @@ EOF
 	  fi
 	  case $linkmode in
 	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
+	    valid_a_lib=no
+	    case $deplibs_check_method in
+	      match_pattern*)
+		set dummy $deplibs_check_method
+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+		if eval $echo \"$deplib\" 2>/dev/null \
+		    | $SED 10q \
+		    | $EGREP "$match_pattern_regex" > /dev/null; then
+		  valid_a_lib=yes
+		fi
+		;;
+	      pass_all)
+		valid_a_lib=yes
+		;;
+            esac
+	    if test "$valid_a_lib" != yes; then
 	      $echo
 	      $echo "*** Warning: Trying to link with static lib archive $deplib."
 	      $echo "*** I have the capability to make that library automatically link in when"
@@ -2019,14 +2198,14 @@ EOF
 	if test "$found" = yes || test -f "$lib"; then :
 	else
 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# Check to see that this really is a libtool archive.
 	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
@@ -2042,6 +2221,8 @@ EOF
 	# it will not redefine variables installed, or shouldnotlink
 	installed=yes
 	shouldnotlink=no
+	avoidtemprpath=
+
 
 	# Read the .la file
 	case $lib in
@@ -2062,7 +2243,7 @@ EOF
 	  if test -z "$libdir"; then
 	    if test -z "$old_library"; then
 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
+	      exit $EXIT_FAILURE
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
 	    convenience="$convenience $ladir/$objdir/$old_library"
@@ -2079,12 +2260,12 @@ EOF
 	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  continue
 	fi # $pass = conv
 
-    
+
 	# Get the name of the library we link against.
 	linklib=
 	for l in $old_library $library_names; do
@@ -2092,16 +2273,18 @@ EOF
 	done
 	if test -z "$linklib"; then
 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# This library was specified with -dlopen.
 	if test "$pass" = dlopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+	  if test -z "$dlname" ||
+	     test "$dlopen_support" != yes ||
+	     test "$build_libtool_libs" = no; then
 	    # If there is no dlname, no dlopen support or we're linking
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
@@ -2138,11 +2321,19 @@ EOF
 	    dir="$libdir"
 	    absdir="$libdir"
 	  fi
+	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	    dir="$ladir"
+	    absdir="$abs_ladir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  else
+	    dir="$ladir/$objdir"
+	    absdir="$abs_ladir/$objdir"
+	    # Remove this search path later
+	    notinst_path="$notinst_path $abs_ladir"
+	  fi
 	fi # $installed = yes
 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
 
@@ -2150,7 +2341,7 @@ EOF
 	if test "$pass" = dlpreopen; then
 	  if test -z "$libdir"; then
 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
 	  # are required to link).
@@ -2177,7 +2368,7 @@ EOF
 	  continue
 	fi
 
-    
+
 	if test "$linkmode" = prog && test "$pass" != link; then
 	  newlib_search_path="$newlib_search_path $ladir"
 	  deplibs="$lib $deplibs"
@@ -2215,12 +2406,12 @@ EOF
 	  if test -n "$library_names" &&
 	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
+	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath " in
 	      *" $dir "*) ;;
 	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
+	      *) temp_rpath="$temp_rpath $absdir" ;;
 	      esac
 	    fi
 
@@ -2264,17 +2455,18 @@ EOF
 	    need_relink=yes
 	  fi
 	  # This is a shared library
-	
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
+
+	  # Warn about portability, can't link against -module's on
+	  # some systems (darwin)
+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
 	    $echo
 	    if test "$linkmode" = prog; then
 	      $echo "*** Warning: Linking the executable $output against the loadable module"
 	    else
 	      $echo "*** Warning: Linking the shared library $output against the loadable module"
 	    fi
-	    $echo "*** $linklib is not portable!"    
-      fi	  
+	    $echo "*** $linklib is not portable!"
+	  fi
 	  if test "$linkmode" = lib &&
 	     test "$hardcode_into_libs" = yes; then
 	    # Hardcode the library path.
@@ -2372,9 +2564,9 @@ EOF
 		case $host in
 		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
 		  *-*-darwin* )
-		    # if the lib is a module then we can not link against it, someone
-		    # is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
+		    # if the lib is a module then we can not link against
+		    # it, someone is ignoring the new warnings I added
+		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
 		      $echo "** Warning, lib $linklib is a module, not a shared library"
 		      if test -z "$old_library" ; then
 		        $echo
@@ -2382,7 +2574,7 @@ EOF
 		        $echo "** The link will probably fail, sorry"
 		      else
 		        add="$dir/$old_library"
-		      fi 
+		      fi
 		    fi
 		esac
 	      elif test "$hardcode_minus_L" = no; then
@@ -2405,7 +2597,7 @@ EOF
 		add_dir="-L$dir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
+		  case $libdir in
 		    [\\/]*)
 		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		      ;;
@@ -2424,7 +2616,7 @@ EOF
 
 	    if test "$lib_linked" != yes; then
 	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
+	      exit $EXIT_FAILURE
 	    fi
 
 	    if test -n "$add_shlibpath"; then
@@ -2467,7 +2659,8 @@ EOF
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
+	      if test -n "$inst_prefix_dir" &&
+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
 	        add="$inst_prefix_dir$libdir/$linklib"
 	      else
 	        add="$libdir/$linklib"
@@ -2477,7 +2670,7 @@ EOF
 	      add_dir="-L$libdir"
 	      # Try looking first in the location we're being installed to.
 	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
+		case $libdir in
 		  [\\/]*)
 		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
 		    ;;
@@ -2538,8 +2731,6 @@ EOF
 	      fi
 	    fi
 	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
 	    deplibs="$dir/$old_library $deplibs"
 	    link_static=yes
 	  fi
@@ -2547,7 +2738,8 @@ EOF
 
 	if test "$linkmode" = lib; then
 	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+	     { test "$hardcode_into_libs" != yes ||
+	       test "$build_old_libs" = yes ||
 	       test "$link_static" = yes; }; then
 	    # Extract -R from dependency_libs
 	    temp_deplibs=
@@ -2604,7 +2796,7 @@ EOF
 		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -z "$libdir"; then
 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
+		    exit $EXIT_FAILURE
 		  fi
 		  if test "$absdir" != "$libdir"; then
 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
@@ -2614,7 +2806,8 @@ EOF
 		depdepl=
 		case $host in
 		*-*-darwin*)
-		  # we do not want to link against static libs, but need to link against shared
+		  # we do not want to link against static libs,
+		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
@@ -2622,7 +2815,7 @@ EOF
 		    done
 		    if test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
-		   fi
+		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
 		    *" $path "*) ;;
@@ -2632,36 +2825,35 @@ EOF
 		  path=""
 		  ;;
 		*)
-		path="-L$path"
-		;;
-		esac 
-		
+		  path="-L$path"
+		  ;;
+		esac
 		;;
-		  -l*)
+	      -l*)
 		case $host in
 		*-*-darwin*)
-		 # Again, we only want to link against shared libraries
-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		 for tmp in $newlib_search_path ; do
-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
-		       break
-		     fi  
-         done
-         path=""
+		  # Again, we only want to link against shared libraries
+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+		  for tmp in $newlib_search_path ; do
+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
+		      break
+		    fi
+		  done
+		  path=""
 		  ;;
 		*) continue ;;
-		esac  		  
+		esac
 		;;
 	      *) continue ;;
 	      esac
 	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
 	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
+	      *) deplibs="$path $deplibs" ;;
+	      esac
+	      case " $deplibs " in
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
 	      esac
 	    done
 	  fi # link_all_deplibs != no
@@ -2748,7 +2940,8 @@ EOF
 	  eval $var=\"$tmp_libs\"
 	done # for var
       fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
+      # Last step: remove runtime libs from dependency_libs
+      # (they stay in deplibs)
       tmp_libs=
       for i in $dependency_libs ; do
 	case " $predeps $postdeps $compiler_lib_search_path " in
@@ -2808,19 +3001,19 @@ EOF
       case $outputname in
       lib*)
 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
+	eval shared_ext=\"$shrext_cmds\"
 	eval libname=\"$libname_spec\"
 	;;
       *)
 	if test "$module" = no; then
 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	if test "$need_lib_prefix" != no; then
 	  # Add the "lib" prefix for modules if required
 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext\"
+	  eval shared_ext=\"$shrext_cmds\"
 	  eval libname=\"$libname_spec\"
 	else
 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
@@ -2831,7 +3024,7 @@ EOF
       if test -n "$objs"; then
 	if test "$deplibs_check_method" != pass_all; then
 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
+	  exit $EXIT_FAILURE
 	else
 	  $echo
 	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
@@ -2879,13 +3072,13 @@ EOF
 	if test -n "$8"; then
 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# convert absolute version numbers to libtool ages
 	# this retains compatibility with .la files and attempts
 	# to make the code below a bit more comprehensible
-	
+
 	case $vinfo_number in
 	yes)
 	  number_major="$2"
@@ -2914,6 +3107,11 @@ EOF
 	    age="$number_minor"
 	    revision="$number_minor"
 	    ;;
+	  *)
+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	    exit $EXIT_FAILURE
+	    ;;
 	  esac
 	  ;;
 	no)
@@ -2925,36 +3123,36 @@ EOF
 
 	# Check that each of the things are valid numbers.
 	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
 	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
 	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
+	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
 	if test "$age" -gt "$current"; then
 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# Calculate the version variables.
@@ -2971,7 +3169,7 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3043,7 +3241,7 @@ EOF
 	*)
 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
 	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
@@ -3097,9 +3295,11 @@ EOF
 	    *.$objext)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	       then
-		 continue
+	       if test "X$precious_files_regex" != "X"; then
+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	         then
+		   continue
+		 fi
 	       fi
 	       removelist="$removelist $p"
 	       ;;
@@ -3175,7 +3375,7 @@ EOF
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
+	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
@@ -3225,7 +3425,7 @@ EOF
 	  if test "$?" -eq 0 ; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
+	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" -ne "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3262,7 +3462,7 @@ EOF
 	    # Error occurred in the first compile.  Let's try to salvage
 	    # the situation: Compile a separate program for each library.
 	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
+	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
@@ -3314,7 +3514,7 @@ EOF
 	  set dummy $deplibs_check_method
 	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    name=`expr $a_deplib : '-l\(.*\)'`
 	    # If $name is empty we are operating on a -L argument.
             if test "$name" != "" && test  "$name" != "0"; then
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3383,7 +3583,7 @@ EOF
 	  set dummy $deplibs_check_method
 	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
 	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    name=`expr $a_deplib : '-l\(.*\)'`
 	    # If $name is empty we are operating on a -L argument.
 	    if test -n "$name" && test "$name" != "0"; then
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
@@ -3580,7 +3780,7 @@ EOF
 	fi
 
 	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
+	eval shared_ext=\"$shrext_cmds\"
 	eval library_names=\"$library_names_spec\"
 	set dummy $library_names
 	realname="$2"
@@ -3624,6 +3824,9 @@ EOF
 	        # The command line is too long to execute in one step.
 	        $show "using reloadable object file for export list..."
 	        skipped_export=:
+		# Break out early, otherwise skipped_export may be
+		# set to false by a later but shorter cmd.
+		break
 	      fi
 	    done
 	    IFS="$save_ifs"
@@ -3644,12 +3847,12 @@ EOF
 	for test_deplib in $deplibs; do
 		case " $convenience " in
 		*" $test_deplib "*) ;;
-		*) 
+		*)
 			tmp_deplibs="$tmp_deplibs $test_deplib"
 			;;
 		esac
 	done
-	deplibs="$tmp_deplibs" 
+	deplibs="$tmp_deplibs"
 
 	if test -n "$convenience"; then
 	  if test -n "$whole_archive_flag_spec"; then
@@ -3657,67 +3860,13 @@ EOF
 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
 	    generated="$generated $gentop"
 
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
+	    func_extract_archives $gentop $convenience
+	    libobjs="$libobjs $func_extract_archives_result"
 	  fi
 	fi
-
+	
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
 	  linker_flags="$linker_flags $flag"
@@ -3747,7 +3896,8 @@ EOF
 	  fi
 	fi
 
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+	if test "X$skipped_export" != "X:" &&
+	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  :
 	else
@@ -3766,6 +3916,7 @@ EOF
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
+	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -3775,13 +3926,13 @@ EOF
 	  delfiles=
 	  last_robj=
 	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
+	  output=$output_objdir/$output_la-${k}.$objext
 	  # Loop over the list of objects to be linked.
 	  for obj in $save_libobjs
 	  do
 	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
 	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
+	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 		 test "$len" -le "$max_cmd_len"; }; then
 	      objlist="$objlist $obj"
 	    else
@@ -3795,9 +3946,9 @@ EOF
 		# the last one created.
 		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
 	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
+	      last_robj=$output_objdir/$output_la-${k}.$objext
 	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
+	      output=$output_objdir/$output_la-${k}.$objext
 	      objlist=$obj
 	      len=1
 	    fi
@@ -3817,13 +3968,13 @@ EOF
 	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
           fi
 
-	  # Set up a command to remove the reloadale object files
+	  # Set up a command to remove the reloadable object files
 	  # after they are used.
 	  i=0
 	  while test "$i" -lt "$k"
 	  do
 	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
 	  done
 
 	  $echo "creating a temporary reloadable object file: $output"
@@ -3832,7 +3983,6 @@ EOF
 	  save_ifs="$IFS"; IFS='~'
 	  for cmd in $concat_cmds; do
 	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || exit $?
 	  done
@@ -3872,14 +4022,31 @@ EOF
 	  IFS="$save_ifs"
 	  eval cmd=\"$cmd\"
 	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
+	  $run eval "$cmd" || {
+	    lt_exit=$?
+
+	    # Restore the uninstalled library and exit
+	    if test "$mode" = relink; then
+	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	    fi
+
+	    exit $lt_exit
+	  }
 	done
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
 	if test "$mode" = relink; then
 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
+
+	  if test -n "$convenience"; then
+	    if test -z "$whole_archive_flag_spec"; then
+	      $show "${rm}r $gentop"
+	      $run ${rm}r "$gentop"
+	    fi
+	  fi
+
+	  exit $EXIT_SUCCESS
 	fi
 
 	# Create links to the real library.
@@ -3927,7 +4094,7 @@ EOF
       *.lo)
 	if test -n "$objs$old_deplibs"; then
 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	libobj="$output"
 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
@@ -3956,64 +4123,10 @@ EOF
 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
 	else
 	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
 	  generated="$generated $gentop"
 
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
+	  func_extract_archives $gentop $convenience
+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
@@ -4038,7 +4151,7 @@ EOF
 	  $run ${rm}r $gentop
 	fi
 
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test "$build_libtool_libs" != yes; then
@@ -4051,7 +4164,7 @@ EOF
 	# accidentally link it into a program.
 	# $show "echo timestamp > $libobj"
 	# $run eval "echo timestamp > $libobj" || exit $?
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test -n "$pic_flag" || test "$pic_mode" != default; then
@@ -4074,7 +4187,7 @@ EOF
 	$run ${rm}r $gentop
       fi
 
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
 
     prog)
@@ -4275,12 +4388,12 @@ extern \"C\" {
 
 	    # Prepare the list of exported symbols
 	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
+	      export_symbols="$output_objdir/$outputname.exp"
 	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+	      $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      $run eval 'mv "$nlist"T "$nlist"'
 	    fi
 	  fi
@@ -4332,7 +4445,26 @@ extern \"C\" {
 #endif
 
 /* The mapping between symbol names and symbols. */
+"
+
+	    case $host in
+	    *cygwin* | *mingw* )
+	  $echo >> "$output_objdir/$dlsyms" "\
+/* DATA imports from DLLs on WIN32 can't be const, because
+   runtime relocations are performed -- see ld's documentation
+   on pseudo-relocs */
+struct {
+"
+	      ;;
+	    * )
+	  $echo >> "$output_objdir/$dlsyms" "\
 const struct {
+"
+	      ;;
+	    esac
+
+
+	  $echo >> "$output_objdir/$dlsyms" "\
   const char *name;
   lt_ptr address;
 }
@@ -4392,7 +4524,7 @@ static const void *lt_preloaded_setup() {
 	  ;;
 	*)
 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
       else
@@ -4480,7 +4612,7 @@ static const void *lt_preloaded_setup() {
 	# Link the executable and exit
 	$show "$link_command"
 	$run eval "$link_command" || exit $?
-	exit 0
+	exit $EXIT_SUCCESS
       fi
 
       if test "$hardcode_action" = relink; then
@@ -4535,10 +4667,10 @@ static const void *lt_preloaded_setup() {
       fi
 
       # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+	case $progpath in
+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
 	esac
 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
       else
@@ -4561,10 +4693,10 @@ static const void *lt_preloaded_setup() {
 	esac
 	case $host in
 	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
+	    cwrappersource=`$echo ${objdir}/lt-${outputname}.c`
 	    cwrapper=`$echo ${output}.exe`
 	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
+	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 
 	    cat > $cwrappersource <<EOF
 
@@ -4573,7 +4705,7 @@ static const void *lt_preloaded_setup() {
 
    The $output program cannot be directly executed until all the libtool
    libraries that it depends on are installed.
-   
+
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
 
@@ -4605,7 +4737,7 @@ EOF
 #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
   defined (__OS2__)
 #define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
+#ifndef DIR_SEPARATOR_2
 #define DIR_SEPARATOR_2 '\\'
 #endif
 #endif
@@ -4636,7 +4768,7 @@ main (int argc, char *argv[])
 {
   char **newargz;
   int i;
-  
+
   program_name = (char *) xstrdup ((char *) basename (argv[0]));
   newargz = XMALLOC(char *, argc+2);
 EOF
@@ -4649,7 +4781,7 @@ EOF
   newargz[1] = fnqualify(argv[0]);
   /* we know the script has the same name, without the .exe */
   /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
+  strendzap(newargz[1],".exe");
   for (i = 1; i < argc; i++)
     newargz[i+1] = xstrdup(argv[i]);
   newargz[argc+1] = NULL;
@@ -4660,6 +4792,7 @@ EOF
 EOF
 
 	    cat >> $cwrappersource <<"EOF"
+  return 127;
 }
 
 void *
@@ -4672,7 +4805,7 @@ xmalloc (size_t num)
   return p;
 }
 
-char * 
+char *
 xstrdup (const char *string)
 {
   return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
@@ -4686,7 +4819,7 @@ basename (const char *name)
 
 #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
   /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
+  if (isalpha (name[0]) && name[1] == ':')
     name += 2;
 #endif
 
@@ -4696,7 +4829,7 @@ basename (const char *name)
   return (char *) base;
 }
 
-char * 
+char *
 fnqualify(const char *path)
 {
   size_t size;
@@ -4724,7 +4857,7 @@ fnqualify(const char *path)
 }
 
 char *
-strendzap(char *str, const char *pat) 
+strendzap(char *str, const char *pat)
 {
   size_t len, patlen;
 
@@ -4744,7 +4877,7 @@ strendzap(char *str, const char *pat)
 }
 
 static void
-lt_error_core (int exit_status, const char * mode, 
+lt_error_core (int exit_status, const char * mode,
           const char * message, va_list ap)
 {
   fprintf (stderr, "%s: %s: ", program_name, mode);
@@ -4773,7 +4906,7 @@ EOF
 	  ;;
 	esac
 	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
+	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
 
 	$echo > $output "\
 #! $SHELL
@@ -4794,7 +4927,7 @@ sed_quote_subst='$sed_quote_subst'
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 relink_command=\"$relink_command\"
 
@@ -4873,7 +5006,7 @@ else
       else
 	$echo \"\$relink_command_output\" >&2
 	$rm \"\$progdir/\$file\"
-	exit 1
+	exit $EXIT_FAILURE
       fi
     fi
 
@@ -4923,32 +5056,32 @@ else
 	# Backslashes separate directories on plain windows
 	*-*-mingw | *-*-os2*)
 	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 "
 	  ;;
 
 	*)
 	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
 "
 	  ;;
 	esac
 	$echo >> $output "\
       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
+      exit $EXIT_FAILURE
     fi
   else
     # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
     \$echo \"This script is just a wrapper for \$program.\" 1>&2
     $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi\
 "
 	chmod +x $output
       fi
-      exit 0
+      exit $EXIT_SUCCESS
       ;;
     esac
 
@@ -4971,71 +5104,73 @@ fi\
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
 	generated="$generated $gentop"
 
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
+	func_extract_archives $gentop $addlibs
+	oldobjs="$oldobjs $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
        cmds=$old_archive_from_new_cmds
       else
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $echo "copying selected object files to avoid basename conflicts..."
+
+	  if test -z "$gentop"; then
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    status=$?
+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+	      exit $status
+	    fi
+	  fi
+
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		counter=`expr $counter + 1`
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      $run ln "$obj" "$gentop/$newobj" ||
+	      $run cp "$obj" "$gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+
 	eval cmds=\"$old_archive_cmds\"
 
 	if len=`expr "X$cmds" : ".*"` &&
@@ -5049,31 +5184,18 @@ fi\
 	  objlist=
 	  concat_cmds=
 	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
+
 	  # Is there a better way of finding the last object in the list?
 	  for obj in $save_oldobjs
 	  do
 	    last_oldobj=$obj
-	  done  
+	  done
 	  for obj in $save_oldobjs
 	  do
 	    oldobjs="$objlist $obj"
 	    objlist="$objlist $obj"
 	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
+	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 	       test "$len" -le "$max_cmd_len"; then
 	      :
 	    else
@@ -5081,7 +5203,7 @@ fi\
 	      oldobjs=$objlist
 	      if test "$obj" = "$last_oldobj" ; then
 	        RANLIB=$save_RANLIB
-	      fi  
+	      fi
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 	      objlist=
@@ -5130,11 +5252,13 @@ fi\
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
-        relink_command=
-      fi  
+	relink_command=
+      fi
+
+
       # Only create the output if not a dry run.
       if test -z "$run"; then
 	for installed in no yes; do
@@ -5152,7 +5276,7 @@ fi\
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		if test -z "$libdir"; then
 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
+		  exit $EXIT_FAILURE
 		fi
 		newdependency_libs="$newdependency_libs $libdir/$name"
 		;;
@@ -5166,7 +5290,7 @@ fi\
 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
+		exit $EXIT_FAILURE
 	      fi
 	      newdlfiles="$newdlfiles $libdir/$name"
 	    done
@@ -5177,7 +5301,7 @@ fi\
 	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 	      if test -z "$libdir"; then
 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
+		exit $EXIT_FAILURE
 	      fi
 	      newdlprefiles="$newdlprefiles $libdir/$name"
 	    done
@@ -5185,7 +5309,7 @@ fi\
 	  else
 	    newdlfiles=
 	    for lib in $dlfiles; do
-	      case $lib in 
+	      case $lib in
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
@@ -5194,7 +5318,7 @@ fi\
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
 	    for lib in $dlprefiles; do
-	      case $lib in 
+	      case $lib in
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
@@ -5257,7 +5381,7 @@ relink_command=\"$relink_command\""
       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
       ;;
     esac
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool install mode
@@ -5268,11 +5392,11 @@ relink_command=\"$relink_command\""
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+       $echo "X$nonopt" | grep shtool > /dev/null; then
       # Aesthetically quote it.
       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
       case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	arg="\"$arg\""
 	;;
       esac
@@ -5281,14 +5405,14 @@ relink_command=\"$relink_command\""
       shift
     else
       install_prog=
-      arg="$nonopt"
+      arg=$nonopt
     fi
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
     case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
       arg="\"$arg\""
       ;;
     esac
@@ -5306,28 +5430,31 @@ relink_command=\"$relink_command\""
     do
       if test -n "$dest"; then
 	files="$files $dest"
-	dest="$arg"
+	dest=$arg
 	continue
       fi
 
       case $arg in
       -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
+      -f) 
+      	case " $install_prog " in
+	*[\\\ /]cp\ *) ;;
+	*) prev=$arg ;;
+	esac
+	;;
+      -g | -m | -o) prev=$arg ;;
       -s)
 	stripme=" -s"
 	continue
 	;;
-      -*) ;;
-
+      -*)
+	;;
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
 	  prev=
 	else
-	  dest="$arg"
+	  dest=$arg
 	  continue
 	fi
 	;;
@@ -5336,7 +5463,7 @@ relink_command=\"$relink_command\""
       # Aesthetically quote the argument.
       arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
       case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
 	arg="\"$arg\""
 	;;
       esac
@@ -5346,13 +5473,13 @@ relink_command=\"$relink_command\""
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test -n "$prev"; then
       $echo "$modename: the \`$prev' option requires an argument" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     if test -z "$files"; then
@@ -5362,7 +5489,7 @@ relink_command=\"$relink_command\""
 	$echo "$modename: you must specify a destination" 1>&2
       fi
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Strip any trailing slash from the destination.
@@ -5383,7 +5510,7 @@ relink_command=\"$relink_command\""
       if test "$#" -gt 2; then
 	$echo "$modename: \`$dest' is not a directory" 1>&2
 	$echo "$help" 1>&2
-	exit 1
+	exit $EXIT_FAILURE
       fi
     fi
     case $destdir in
@@ -5395,7 +5522,7 @@ relink_command=\"$relink_command\""
 	*)
 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
       done
@@ -5424,7 +5551,7 @@ relink_command=\"$relink_command\""
 	else
 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	library_names=
@@ -5466,7 +5593,7 @@ relink_command=\"$relink_command\""
 	  # but it's something to keep an eye on.
 	  if test "$inst_prefix_dir" = "$destdir"; then
 	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 
 	  if test -n "$inst_prefix_dir"; then
@@ -5481,7 +5608,7 @@ relink_command=\"$relink_command\""
 	  if $run eval "$relink_command"; then :
 	  else
 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 	fi
 
@@ -5505,11 +5632,14 @@ relink_command=\"$relink_command\""
 
 	  if test "$#" -gt 0; then
 	    # Delete the old symlinks, and create new ones.
+	    # Try `ln -sf' first, because the `ln' binary might depend on
+	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+	    # so we also need to try rm && ln -s.
 	    for linkname
 	    do
 	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
 	      fi
 	    done
 	  fi
@@ -5522,7 +5652,16 @@ relink_command=\"$relink_command\""
 	    IFS="$save_ifs"
 	    eval cmd=\"$cmd\"
 	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
+	    $run eval "$cmd" || {
+	      lt_exit=$?
+
+	      # Restore the uninstalled library and exit
+	      if test "$mode" = relink; then
+		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
+	      fi
+
+	      exit $lt_exit
+	    }
 	  done
 	  IFS="$save_ifs"
 	fi
@@ -5560,7 +5699,7 @@ relink_command=\"$relink_command\""
 	*)
 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	  ;;
 	esac
 
@@ -5578,7 +5717,7 @@ relink_command=\"$relink_command\""
 	  $show "$install_prog $staticobj $staticdest"
 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
 	fi
-	exit 0
+	exit $EXIT_SUCCESS
 	;;
 
       *)
@@ -5616,23 +5755,21 @@ relink_command=\"$relink_command\""
 	  notinst_deplibs=
 	  relink_command=
 
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  # Check the variables that should have been set.
 	  if test -z "$notinst_deplibs"; then
 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit 1
+	    exit $EXIT_FAILURE
 	  fi
 
 	  finalize=yes
@@ -5654,17 +5791,15 @@ relink_command=\"$relink_command\""
 	  done
 
 	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
+	  # Note that it is not necessary on cygwin/mingw to append a dot to
+	  # foo even if both foo and FILE.exe exist: automatic-append-.exe
+	  # behavior happens only for exec(3), not for open(2)!  Also, sourcing
+	  # `FILE.' does not work on cygwin managed mounts.
+	  #
 	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
+	  case $wrapper in
+	  */* | *\\*) . ${wrapper} ;;
+	  *) . ./${wrapper} ;;
 	  esac
 
 	  outputname=
@@ -5672,14 +5807,15 @@ relink_command=\"$relink_command\""
 	    if test "$finalize" = yes && test -z "$run"; then
 	      tmpdir="/tmp"
 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-              if tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`; then :
+	      tmpdir="$tmpdir/libtool-$$"
+	      save_umask=`umask`
+	      umask 0077
+	      if $mkdir "$tmpdir"; then
+	        umask $save_umask
 	      else
-                tmpdir="$tmpdir/libtool-$$"
-		if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
-		else
-		  $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		  continue
-		fi
+	        umask $save_umask
+		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+		continue
 	      fi
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
@@ -5704,7 +5840,7 @@ relink_command=\"$relink_command\""
 	fi
 
 	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
+	# one anyway 
 	case $install_prog,$host in
 	*/usr/bin/install*,*cygwin*)
 	  case $file:$destfile in
@@ -5760,9 +5896,9 @@ relink_command=\"$relink_command\""
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
     else
-      exit 0
+      exit $EXIT_SUCCESS
     fi
     ;;
 
@@ -5802,7 +5938,7 @@ relink_command=\"$relink_command\""
     fi
 
     # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
+    test "$show" = : && exit $EXIT_SUCCESS
 
     $echo "----------------------------------------------------------------------"
     $echo "Libraries have been installed in:"
@@ -5838,7 +5974,7 @@ relink_command=\"$relink_command\""
     $echo "See any operating system documentation about shared libraries for"
     $echo "more information, such as the ld(1) and ld.so(8) manual pages."
     $echo "----------------------------------------------------------------------"
-    exit 0
+    exit $EXIT_SUCCESS
     ;;
 
   # libtool execute mode
@@ -5850,7 +5986,7 @@ relink_command=\"$relink_command\""
     if test -z "$cmd"; then
       $echo "$modename: you must specify a COMMAND" 1>&2
       $echo "$help"
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     # Handle -dlopen flags immediately.
@@ -5858,7 +5994,7 @@ relink_command=\"$relink_command\""
       if test ! -f "$file"; then
 	$echo "$modename: \`$file' is not a file" 1>&2
 	$echo "$help" 1>&2
-	exit 1
+	exit $EXIT_FAILURE
       fi
 
       dir=
@@ -5869,7 +6005,7 @@ relink_command=\"$relink_command\""
 	else
 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
 	  $echo "$help" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 
 	# Read the libtool library.
@@ -5896,7 +6032,7 @@ relink_command=\"$relink_command\""
 	  dir="$dir/$objdir"
 	else
 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
+	  exit $EXIT_FAILURE
 	fi
 	;;
 
@@ -5968,15 +6104,15 @@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd="\"\$cmd\"$args"
+      exec_cmd="\$cmd$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 	$echo "export $shlibpath_var"
       fi
-      eval \$echo \"\$cmd\"$args
-      exit 0
+      $echo "$cmd$args"
+      exit $EXIT_SUCCESS
     fi
     ;;
 
@@ -6004,7 +6140,7 @@ relink_command=\"$relink_command\""
     if test -z "$rm"; then
       $echo "$modename: you must specify an RM program" 1>&2
       $echo "$help" 1>&2
-      exit 1
+      exit $EXIT_FAILURE
     fi
 
     rmdirs=
@@ -6118,7 +6254,7 @@ relink_command=\"$relink_command\""
 	if test "$mode" = clean ; then
 	  noexename=$name
 	  case $file in
-	  *.exe) 
+	  *.exe)
 	    file=`$echo $file|${SED} 's,.exe$,,'`
 	    noexename=`$echo $name|${SED} 's,.exe$,,'`
 	    # $file with .exe has already been added to rmfiles,
@@ -6163,20 +6299,20 @@ relink_command=\"$relink_command\""
   "")
     $echo "$modename: you must specify a MODE" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
     ;;
   esac
 
   if test -z "$exec_cmd"; then
     $echo "$modename: invalid operation mode \`$mode'" 1>&2
     $echo "$generic_help" 1>&2
-    exit 1
+    exit $EXIT_FAILURE
   fi
 fi # test -z "$show_help"
 
 if test -n "$exec_cmd"; then
   eval exec $exec_cmd
-  exit 1
+  exit $EXIT_FAILURE
 fi
 
 # We need to display help for each of the modes.
@@ -6212,7 +6348,7 @@ MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
 a more detailed description of MODE.
 
 Report bugs to <bug-libtool@gnu.org>."
-  exit 0
+  exit $EXIT_SUCCESS
   ;;
 
 clean)
@@ -6367,14 +6503,14 @@ Otherwise, only FILE itself is deleted using RM."
 *)
   $echo "$modename: invalid operation mode \`$mode'" 1>&2
   $echo "$help" 1>&2
-  exit 1
+  exit $EXIT_FAILURE
   ;;
 esac
 
 $echo
 $echo "Try \`$modename --help' for more information about other modes."
 
-exit 0
+exit $?
 
 # The TAGs below are defined such that we never get into a situation
 # in which we disable both kinds of libraries.  Given conflicting
diff --git a/scripts/missing b/scripts/missing
index 09edd88..894e786 100755
--- a/scripts/missing
+++ b/scripts/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-02-08.22
+scriptversion=2005-06-08.21
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
 #   Free Software Foundation, Inc.
@@ -19,8 +19,8 @@ scriptversion=2005-02-08.22
 
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -297,6 +297,9 @@ WARNING: \`$1' is $msg.  You should only need it if
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
+    # If the file does not exist, the user really needs makeinfo;
+    # let's fail without touching anything.
+    test -f $file || exit 1
     touch $file
     ;;
 
diff --git a/scripts/mkinstalldirs b/scripts/mkinstalldirs
index 5d26a48..259dbfc 100755
--- a/scripts/mkinstalldirs
+++ b/scripts/mkinstalldirs
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 
-scriptversion=2005-02-02.21
+scriptversion=2005-06-29.22
 
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
@@ -12,7 +12,7 @@ scriptversion=2005-02-02.21
 # <automake-patches@gnu.org>.
 
 errstatus=0
-dirmode=""
+dirmode=
 
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
@@ -103,13 +103,21 @@ esac
 
 for file
 do
-  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  case $file in
+    /*) pathcomp=/ ;;
+    *)  pathcomp= ;;
+  esac
+  oIFS=$IFS
+  IFS=/
+  set fnord $file
   shift
+  IFS=$oIFS
 
-  pathcomp=
   for d
   do
-    pathcomp="$pathcomp$d"
+    test "x$d" = x && continue
+
+    pathcomp=$pathcomp$d
     case $pathcomp in
       -*) pathcomp=./$pathcomp ;;
     esac
@@ -124,7 +132,7 @@ do
       else
 	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
+	  lasterr=
 	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
 	  if test ! -z "$lasterr"; then
@@ -134,7 +142,7 @@ do
       fi
     fi
 
-    pathcomp="$pathcomp/"
+    pathcomp=$pathcomp/
   done
 done
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4a312ad..0f471da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.18 2004/09/17 18:38:09 rleigh Exp $
+## $Id: Makefile.am,v 1.19 2005/11/21 11:16:22 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 SUBDIRS = 					\
diff --git a/src/Makefile.in b/src/Makefile.in
index 48de6f0..63a4960 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -53,6 +53,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+depcomp =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -67,8 +69,6 @@ DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -106,7 +106,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -119,14 +118,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -261,13 +258,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -313,8 +305,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 SUBDIRS = \
 	main					\
@@ -341,9 +331,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index 1448f15..f4ffc06 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.81 2005/02/03 22:00:30 rleigh Exp $
+## $Id: Makefile.am,v 1.83 2005/11/22 14:43:05 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
@@ -119,11 +115,11 @@ endif
 
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(cups_modeldir); \
+	  $(mkdir_p) $(DESTDIR)$(cups_modeldir); \
 	  cd ppd ; \
 	  for language in * ; do \
 	    cd ..; \
-	    $(mkinstalldirs) $(DESTDIR)$(cups_modeldir)/$$language; \
+	    $(mkdir_p) $(DESTDIR)$(cups_modeldir)/$$language; \
 	    cd ppd/$$language; \
 	    for ppdfile in * ; do \
 	      (cd ../..; $(INSTALL_DATA) ppd/$$language/$$ppdfile $(DESTDIR)$(cups_modeldir)/$$language) ; \
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index bb55b9e..f506b11 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -18,8 +18,6 @@
 
 
 
-SOURCES = $(canon_SOURCES) commandtocanon.c $(commandtoepson_SOURCES) $(cups_calibrate_SOURCES) $(cups_genppd_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES) $(epson_SOURCES) $(rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -106,8 +104,8 @@ rastertogutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_DEPENDE
 sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(sbin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -142,8 +140,6 @@ pkgdatadir = $(cups_conf_datadir)
 pkglibdir = $(cups_conf_serverbin)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -181,7 +177,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -194,14 +189,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -336,13 +329,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @cups_bindir@
@@ -388,8 +376,6 @@ sbindir = @cups_sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 empty = 
 pkgsysconfdir = $(cups_conf_serverroot)
@@ -446,9 +432,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/cups/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/cups/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/cups/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/cups/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -629,34 +615,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtocanon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtoepson.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cups-calibrate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/epson.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genppd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rastertoprinter.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -822,7 +788,6 @@ clean-am: clean-binPROGRAMS clean-cupsexec_backendPROGRAMS \
 	clean-local clean-sbinPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -853,7 +818,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -924,11 +888,11 @@ cups-genppdupdate.@GUTENPRINT_MAJOR_VERSION@.@GUTENPRINT_MINOR_VERSION@: $(top_b
 
 install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 	if test -n "$(INSTALL_DATA_LOCAL_DEPS)" ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(cups_modeldir); \
+	  $(mkdir_p) $(DESTDIR)$(cups_modeldir); \
 	  cd ppd ; \
 	  for language in * ; do \
 	    cd ..; \
-	    $(mkinstalldirs) $(DESTDIR)$(cups_modeldir)/$$language; \
+	    $(mkdir_p) $(DESTDIR)$(cups_modeldir)/$$language; \
 	    cd ppd/$$language; \
 	    for ppdfile in * ; do \
 	      (cd ../..; $(INSTALL_DATA) ppd/$$language/$$ppdfile $(DESTDIR)$(cups_modeldir)/$$language) ; \
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index f7f6e62..c39d768 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: genppd.c,v 1.107 2005/04/23 00:26:07 rlk Exp $"
+ * "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $"
  *
  *   PPD file generation program for the CUPS drivers.
  *
@@ -30,8 +30,6 @@
  * Contents:
  *
  *   main()                   - Process files on the command-line...
- *   initialize_stp_options() - Initialize the min/max values for
- *                              each STP numeric option.
  *   usage()                  - Show program usage.
  *   help()                   - Show detailed program usage.
  *   getlangs()               - Get available translations.
@@ -510,7 +508,7 @@ dirent_sort(const void *a,
 char **
 getlangs(void)
 {
-  struct dirent** langdirs;
+  struct dirent** langdirs = NULL;
   int n;
   char **langs;
 
@@ -1440,7 +1438,7 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 			}
 		      if (!desc.is_mandatory)
 			gzprintf(fp, "*Stp%s None/None: \"\"\n",
-				 desc.name, desc.deflt.dbl);
+				 desc.name);
 		      else if (! printed_default_value)
 			gzprintf(fp, "*Stp%s None/%.3f: \"\"\n",
 				 desc.name, desc.deflt.dbl);
@@ -1709,5 +1707,5 @@ write_ppd(const stp_printer_t *p,	/* I - Printer driver */
 
 
 /*
- * End of "$Id: genppd.c,v 1.107 2005/04/23 00:26:07 rlk Exp $".
+ * End of "$Id: genppd.c,v 1.109 2005/10/18 02:08:16 rlk Exp $".
  */
diff --git a/src/escputil/Makefile.am b/src/escputil/Makefile.am
index e46d38b..4bba6e2 100644
--- a/src/escputil/Makefile.am
+++ b/src/escputil/Makefile.am
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/escputil/Makefile.in b/src/escputil/Makefile.in
index 1e4adc4..91cb23a 100644
--- a/src/escputil/Makefile.in
+++ b/src/escputil/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
 
 # Variables
 
-SOURCES = $(escputil_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -66,8 +64,8 @@ am__DEPENDENCIES_1 = $(top_builddir)/src/main/libgutenprint.la
 am__DEPENDENCIES_2 =
 escputil_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -83,8 +81,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -122,7 +118,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -135,14 +130,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -277,13 +270,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -329,8 +317,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 escputil_SOURCES = d4lib.c escputil.c d4lib.h
 escputil_LDADD = $(GUTENPRINT_LIBS) $(LIBREADLINE_DEPS)
@@ -348,9 +334,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/escputil/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/escputil/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/escputil/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/escputil/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -406,29 +392,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/d4lib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escputil.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -553,7 +524,6 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -579,7 +549,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/escputil/escputil.c b/src/escputil/escputil.c
index 669cd88..3be1bf3 100644
--- a/src/escputil/escputil.c
+++ b/src/escputil/escputil.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escputil.c,v 1.75 2005/08/13 20:24:55 rlk Exp $"
+ * "$Id: escputil.c,v 1.76 2005/10/01 18:47:29 rlk Exp $"
  *
  *   Printer maintenance utility for EPSON Stylus (R) printers
  *
@@ -858,20 +858,22 @@ get_printer(int quiet, int fail_if_not_found)
 
 static const char *colors_new[] =
   {
-    N_("Black"),
-    N_("Matte Black"),
-    N_("Photo Black"),
-    N_("Cyan"),
-    N_("Magenta"),
-    N_("Yellow"),
-    N_("Light Cyan"),
-    N_("Light Magenta"),
-    N_("Dark Yellow"),
-    N_("Light Black"),
-    N_("unknown"),
-    N_("Red"),
-    N_("Blue"),
-    N_("Gloss Optimizer"),
+    N_("Black"),		/* 0 */
+    N_("Photo Black"),		/* 1 */
+    N_("Unknown"),		/* 2 */
+    N_("Cyan"),			/* 3 */
+    N_("Magenta"),		/* 4 */
+    N_("Yellow"),		/* 5 */
+    N_("Light Cyan"),		/* 6 */
+    N_("Light Magenta"),	/* 7 */
+    N_("Unknown"),		/* 8 */
+    N_("Unknown"),		/* 9 */
+    N_("Light Black"),		/* a */
+    N_("Matte Black"),		/* b */
+    N_("Red"),			/* c */
+    N_("Blue"),			/* d */
+    N_("Gloss Optimizer"),	/* e */
+    N_("Light Light Black"),	/* f */
   };
 
 static int color_count = sizeof(colors_new) / sizeof(const char *);
@@ -969,34 +971,15 @@ do_status_command_internal(status_cmd_t cmd)
 		      while (buf[i] != 0x0f && i < status)
 			i += buf[i + 1] + 2;
 		      ind = buf + i;
-		      i = 4;
+		      i = 3;
 		      col_number = 0;
-		      printf("%20s    %s\n", _("Ink color"), _("Percent remaining"));
-		      while (i < ind[1] + 3)
+		      printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
+		      while (i < ind[1])
 			{
-			  if (ind[i] == 0)
-			    {
-			      /* black */
-			      switch (col_number)
-				{
-				case 0:
-				  printf("%20s    %3d\n", _(colors_new[0]), ind[i + 1]);
-				  break;
-				case 3:
-				  printf("%20s    %3d\n", _(colors_new[1]), ind[i + 1]);
-				  break;
-				case 4:
-				  printf("%20s    %3d\n", _(colors_new[2]), ind[i + 1]);
-				  break;
-				}
-			    }
+			  if (ind[i] < color_count)
+			    printf("%18s    %20d\n", _(colors_new[(int) ind[i]]), ind[i + 2]);
 			  else
-			    {
-			      if (ind[i] + 2 < color_count)
-				printf("%20s    %3d\n", _(colors_new[ind[i] + 2]), ind[i + 1]);
-			      else
-				printf("%18s%2x    %3d\n", _("Unknown"), ind[i] + 2, ind[i + 1]);
-			    }
+			    printf("%18s    %20d\n", _("Unknown"), ind[i + 2]);
 			  col_number++;
 			  i+=3;
 			}
@@ -1085,7 +1068,7 @@ do_status_command_internal(status_cmd_t cmd)
     {
       ind += 3;
 
-      printf("%20s    %s\n", _("Ink color"), _("Percent remaining"));
+      printf("%18s    %20s\n", _("Ink color"), _("Percent remaining"));
       for (i = 0; i < stp_string_list_count(desc.bounds.str); i++)
 	{
 	  int val, j;
@@ -1103,7 +1086,7 @@ do_status_command_internal(status_cmd_t cmd)
 		exit(1);
 	    }
 	  val = (ind[0] << 4) + ind[1];
-	  printf("%20s    %3d\n",_(stp_string_list_param(desc.bounds.str, i)->text),
+	  printf("%18s    %20d\n",_(stp_string_list_param(desc.bounds.str, i)->text),
 		 val);
 	  ind += 2;
 	}
@@ -1134,7 +1117,8 @@ do_extended_ink_info(int extended_output)
   int credit;
   int retry = 4;
   char buf[1024];
-  unsigned val, id, year, month, ik1, ik2;
+  unsigned val, id, id2, year, year2, month, month2;
+  unsigned iv[6];
 
   char *ind;
   int i;
@@ -1192,17 +1176,68 @@ do_extended_ink_info(int extended_output)
                       exit(1);
                     }
                   ind = strchr(buf, 'I');
-                  if (sscanf(ind,
-                             "II:01;IQT:%x;TSH:NAVL;PDY:%x;PDM:%x;IC1:%x;IC2:000A;IK1:%x;IK2:%x;TOV:18;TVU:06;LOG:INKbyEPSON;",
-                             &val, &year, &month, &id, &ik1, &ik2 ) == 6)
+		  if (sscanf(ind,
+                             "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
+			     &iv[0], &year, &month, &id,
+			     &iv[1], &iv[2], &iv[3], &iv[4], &iv[5],
+			     &year2, &month2, &id2) == 12 ||
+		      sscanf(ind,
+                             "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
+			     &iv[0], &year, &month, &id,
+			     &iv[1], &iv[2], &iv[3], &iv[4], &iv[5],
+			     &year2, &month2, &id2) == 12)
+		    {
+		      int j;
+		      printf("%18s    %20s   %12s   %7s\n",
+			     _("Ink color"), _("Percent remaining"), _("Part number"),
+			     _("Date"));
+                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+                             _(stp_string_list_param(desc.bounds.str, 0)->text),
+                             iv[0], id, (year > 80 ? 19 : 20), year, month);
+		      for (j = 1; j < 6; j++)
+                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+                             _(stp_string_list_param(desc.bounds.str, j)->text),
+                             iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
+		      break;
+		    }
+		  else if (sscanf(ind,
+				  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;IQT:%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
+				  &iv[0], &year, &month, &id,
+				  &iv[1], &iv[2], &iv[3],
+				  &year2, &month2, &id2) == 10 ||
+			   sscanf(ind,
+				  "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;IQT:%x,%x,%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*xIK1:%*x;IK2;%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
+				  &iv[0], &year, &month, &id,
+				  &iv[1], &iv[2], &iv[3],
+				  &year2, &month2, &id2) == 10)
+		    {
+		      int j;
+		      printf("%18s    %20s   %12s   %7s\n",
+			     _("Ink color"), _("Percent remaining"), _("Part number"),
+			     _("Date"));
+                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+                             _(stp_string_list_param(desc.bounds.str, 0)->text),
+                             iv[0], id, (year > 80 ? 19 : 20), year, month);
+		      for (j = 1; j < 4; j++)
+                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
+                             _(stp_string_list_param(desc.bounds.str, j)->text),
+                             iv[j], id2, (year2 > 80 ? 19 : 20), year2, month2);
+		      break;
+		    }
+                  else if (sscanf(ind,
+                             "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:EPSON;",
+                             &val, &year, &month, &id ) == 4 ||
+			   sscanf(ind,
+                             "II:01;IQT:%x;TSH:%*4s;PDY:%x;PDM:%x;IC1:%x;IC2:%*x;IK1:%*x;IK2:%*x;TOV:%*x;TVU:%*x;LOG:INKbyEPSON;",
+                             &val, &year, &month, &id ) == 4)
                     {
                       if (i == 0)
-                        printf("%15s    %20s   %12s   %7s\n",
+                        printf("%18s    %20s   %12s   %7s\n",
                                _("Ink color"), _("Percent remaining"), _("Part number"),
                                _("Date"));
-                      printf("%15s    %20d    T0%03d            20%02d-%02d\n",
+                      printf("%18s    %20d    T0%03d            %2d%02d-%02d\n",
                              _(stp_string_list_param(desc.bounds.str, i)->text),
-                             val, id, year, month);
+                             val, id, (year > 80 ? 19 : 20), year, month);
                     }
                 }
               else /* could not write */
diff --git a/src/foomatic/Makefile.am b/src/foomatic/Makefile.am
index 294104a..316dcbe 100644
--- a/src/foomatic/Makefile.am
+++ b/src/foomatic/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.45 2005/04/12 00:45:09 rlk Exp $
+## $Id: Makefile.am,v 1.47 2005/11/22 14:43:05 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
@@ -82,7 +78,7 @@ install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 install-kit:
 	if test -n "$(DESTDIR)" ; then \
-	  $(mkinstalldirs) $(DESTDIR)`$(FOOMATIC_KITLOAD) -l` ; \
+	  $(mkdir_p) $(DESTDIR)`$(FOOMATIC_KITLOAD) -l` ; \
 	  $(FOOMATIC_KITLOAD) -f -d $(DESTDIR) -k $(FOOMATIC_DB) ; \
 	else \
 	  $(FOOMATIC_KITLOAD) -f -k $(FOOMATIC_DB) ; \
diff --git a/src/foomatic/Makefile.in b/src/foomatic/Makefile.in
index a9abef7..2cbf359 100644
--- a/src/foomatic/Makefile.in
+++ b/src/foomatic/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
 
 # Variables
 
-SOURCES = $(gutenprint_version_SOURCES) $(paper_sizes_SOURCES) $(printer_margins_SOURCES) $(printer_options_SOURCES) $(printers_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -80,8 +78,8 @@ am_printers_OBJECTS = printers.$(OBJEXT)
 printers_OBJECTS = $(am_printers_OBJECTS)
 printers_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -101,8 +99,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -140,7 +136,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -153,14 +148,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -295,13 +288,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -347,8 +335,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 DISTDIRS = foomatic-templates-ijs
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS)
@@ -383,9 +369,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/foomatic/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/foomatic/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/foomatic/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/foomatic/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -436,32 +422,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gutenprint-version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paper_sizes.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer_margins.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printer_options.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -588,7 +556,6 @@ clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -614,7 +581,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -675,7 +641,7 @@ install-data-local: $(INSTALL_DATA_LOCAL_DEPS)
 
 install-kit:
 	if test -n "$(DESTDIR)" ; then \
-	  $(mkinstalldirs) $(DESTDIR)`$(FOOMATIC_KITLOAD) -l` ; \
+	  $(mkdir_p) $(DESTDIR)`$(FOOMATIC_KITLOAD) -l` ; \
 	  $(FOOMATIC_KITLOAD) -f -d $(DESTDIR) -k $(FOOMATIC_DB) ; \
 	else \
 	  $(FOOMATIC_KITLOAD) -f -k $(FOOMATIC_DB) ; \
diff --git a/src/foomatic/foomatic-printermap b/src/foomatic/foomatic-printermap
index e80bf16..a7d7ee7 100644
--- a/src/foomatic/foomatic-printermap
+++ b/src/foomatic/foomatic-printermap
@@ -64,7 +64,9 @@
 #gptofoo canon-cp220 printer/Canon-CP-330
 #gptofoo canon-cp220 printer/Canon-SELPHY-CP-400
 #gptofoo canon-cp220 printer/Canon-SELPHY-CP-500
+#gptofoo canon-cp220 printer/Canon-SELPHY-CP-510
 #gptofoo canon-cp220 printer/Canon-SELPHY-CP-600
+#gptofoo canon-cp220 printer/Canon-SELPHY-CP-710
 #gptofoo pcl-4 printer/Canon-GP_335
 #gptofoo pcl-3 printer/Canon-LBP-4sx
 #gptofoo pcl-4l printer/Canon-LBP-430
@@ -72,6 +74,7 @@
 #gptofoo pcl-6 printer/Canon-LBP-1260
 #gptofoo pcl-6 printer/Canon-LBP-1760
 #gptofoo bjc-4300 printer/Canon-S100
+#gptofoo bjc-s200 printer/Canon-S200
 #gptofoo bjc-s800 printer/Canon-S300
 #gptofoo bjc-s400 printer/Canon-S400
 #gptofoo bjc-s450 printer/Canon-S450
@@ -104,20 +107,27 @@
 #gptofoo pcl-4 printer/Epson-EPL-6100
 #gptofoo pcl-4 printer/Epson-EPL-6100PS
 #gptofoo pcl-2 printer/Epson-EPL-7100
+#gptofoo escp2-c20 printer/Epson-Stylus_C20
 #gptofoo escp2-c20sx printer/Epson-Stylus_C20SX
 #gptofoo escp2-c20ux printer/Epson-Stylus_C20UX
+#gptofoo escp2-c40 printer/Epson-Stylus_C40
 #gptofoo escp2-c40sx printer/Epson-Stylus_C40SX
 #gptofoo escp2-c40ux printer/Epson-Stylus_C40UX
+#gptofoo escp2-c41 printer/Epson-Stylus_C41
 #gptofoo escp2-c41sx printer/Epson-Stylus_C41SX
 #gptofoo escp2-c41ux printer/Epson-Stylus_C41UX
+#gptofoo escp2-c42 printer/Epson-Stylus_C42
 #gptofoo escp2-c42sx printer/Epson-Stylus_C42SX
 #gptofoo escp2-c42ux printer/Epson-Stylus_C42UX
+#gptofoo escp2-c43 printer/Epson-Stylus_C43
 #gptofoo escp2-c43sx printer/Epson-Stylus_C43SX
 #gptofoo escp2-c43ux printer/Epson-Stylus_C43UX
+#gptofoo escp2-c44 printer/Epson-Stylus_C44
 #gptofoo escp2-c44sx printer/Epson-Stylus_C44SX
 #gptofoo escp2-c44ux printer/Epson-Stylus_C44UX
 #gptofoo escp2-c45 printer/Epson-Stylus_C45
 #gptofoo escp2-c46 printer/Epson-Stylus_C46
+#gptofoo escp2-c48 printer/Epson-Stylus_C48
 #gptofoo escp2-c50 printer/Epson-Stylus_C50
 #gptofoo escp2-c60 printer/Epson-Stylus_C60
 #gptofoo escp2-c61 printer/Epson-Stylus_C61
@@ -126,6 +136,7 @@
 #gptofoo escp2-c64 printer/Epson-Stylus_C64
 #gptofoo escp2-c65 printer/Epson-Stylus_C65
 #gptofoo escp2-c66 printer/Epson-Stylus_C66
+#gptofoo escp2-c68 printer/Epson-Stylus_C68
 #gptofoo escp2-c70 printer/Epson-Stylus_C70
 #gptofoo escp2-c80 printer/Epson-Stylus_C80
 #gptofoo escp2-c82 printer/Epson-Stylus_C82
@@ -133,6 +144,7 @@
 #gptofoo escp2-c84 printer/Epson-Stylus_C84
 #gptofoo escp2-c85 printer/Epson-Stylus_C85
 #gptofoo escp2-c86 printer/Epson-Stylus_C86
+#gptofoo escp2-c88 printer/Epson-Stylus_C88
 #gptofoo escp2 printer/Epson-Stylus_Color
 #gptofoo escp2 printer/Epson-Stylus_Color_I
 #gptofoo escp2 printer/Epson-Stylus_Color_II
@@ -196,8 +208,11 @@
 #gptofoo escp2-ex3 printer/Epson-Stylus_Photo_EX3
 #gptofoo escp2-r200 printer/Epson-Stylus_Photo_R200
 #gptofoo escp2-r210 printer/Epson-Stylus_Photo_R210
+#gptofoo escp2-r220 printer/Epson-Stylus_Photo_R220
 #gptofoo escp2-r300 printer/Epson-Stylus_Photo_R300
 #gptofoo escp2-r310 printer/Epson-Stylus_Photo_R310
+#gptofoo escp2-r320 printer/Epson-Stylus_Photo_R320
+#gptofoo escp2-r340 printer/Epson-Stylus_Photo_R340
 #gptofoo escp2-rx400 printer/Epson-Stylus_Photo_RX400
 #gptofoo escp2-rx420 printer/Epson-Stylus_Photo_RX420
 #gptofoo escp2-rx425 printer/Epson-Stylus_Photo_RX425
@@ -207,8 +222,10 @@
 #gptofoo escp2-rx600 printer/Epson-Stylus_Photo_RX600
 #gptofoo escp2-rx620 printer/Epson-Stylus_Photo_RX620
 #gptofoo escp2-rx630 printer/Epson-Stylus_Photo_RX630
+#gptofoo escp2-rx700 printer/Epson-Stylus_Photo_RX700
 #gptofoo escp2-r800 printer/Epson-Stylus_Photo_R800
 #gptofoo escp2-r1800 printer/Epson-Stylus_Photo_R1800
+#gptofoo escp2-r2400 printer/Epson-Stylus_Photo_R2400
 #gptofoo escp2-5000 printer/Epson-Stylus_Pro_5000
 #gptofoo escp2-5500 printer/Epson-Stylus_Pro_5500
 #gptofoo escp2-7000 printer/Epson-Stylus_Pro_7000
@@ -226,17 +243,32 @@
 #gptofoo escp2-cx3500 printer/Epson-Stylus_CX3500
 #gptofoo escp2-cx3600 printer/Epson-Stylus_CX3600
 #gptofoo escp2-cx3650 printer/Epson-Stylus_CX3650
+#gptofoo escp2-cx3700 printer/Epson-Stylus_CX3700
+#gptofoo escp2-cx3800 printer/Epson-Stylus_CX3800
+#gptofoo escp2-cx3810 printer/Epson-Stylus_CX3810
+#gptofoo escp2-cx4200 printer/Epson-Stylus_CX4200
 #gptofoo escp2-cx4600 printer/Epson-Stylus_CX4600
+#gptofoo escp2-cx4700 printer/Epson-Stylus_CX4700
+#gptofoo escp2-cx4800 printer/Epson-Stylus_CX4800
 #gptofoo escp2-cx5100 printer/Epson-Stylus_CX5100
 #gptofoo escp2-cx5200 printer/Epson-Stylus_CX5200
 #gptofoo escp2-cx5300 printer/Epson-Stylus_CX5300
 #gptofoo escp2-cx5400 printer/Epson-Stylus_CX5400
+#gptofoo escp2-cx5800 printer/Epson-Stylus_CX5800
 #gptofoo escp2-cx6300 printer/Epson-Stylus_CX6300
 #gptofoo escp2-cx6400 printer/Epson-Stylus_CX6400
 #gptofoo escp2-cx6500 printer/Epson-Stylus_CX6500
 #gptofoo escp2-cx6600 printer/Epson-Stylus_CX6600
+#gptofoo escp2-cx7700 printer/Epson-Stylus_CX7700
+#gptofoo escp2-cx7800 printer/Epson-Stylus_CX7800
 #gptofoo escp2-cx8300 printer/Epson-Stylus_CX8300
 #gptofoo escp2-cx8400 printer/Epson-Stylus_CX8400
+#gptofoo escp2-d68 printer/Epson-Stylus_D68
+#gptofoo escp2-d88 printer/Epson-Stylus_D88
+#gptofoo escp2-dx3800 printer/Epson-Stylus_DX3800
+#gptofoo escp2-dx3850 printer/Epson-Stylus_DX3850
+#gptofoo escp2-dx4200 printer/Epson-Stylus_DX4200
+#gptofoo escp2-dx4800 printer/Epson-Stylus_DX4800
 #gptofoo escp2-cl700 printer/Epson-CL_700
 #gptofoo escp2-cl750 printer/Epson-CL_750
 #gptofoo escp2-cl760 printer/Epson-CL_760
@@ -638,6 +670,7 @@
 #gptofoo pcl-2 printer/Olivetti-JP350S
 #gptofoo pcl-2 printer/Olivetti-PG_306
 #gptofoo olympus-p10 printer/Olympus-P-10
+#gptofoo olympus-p10 printer/Olympus-P-11
 #gptofoo olympus-p200 printer/Olympus-P-200
 #gptofoo olympus-p300 printer/Olympus-P-300E
 #gptofoo olympus-p300 printer/Olympus-P-300U
@@ -669,6 +702,7 @@
 #gptofoo pcl-6 printer/Sharp-AR-161
 #gptofoo pcl-601 printer/Sony-IJP-V100
 #gptofoo sony-updp10 printer/Sony-UP-DP10
+#gptofoo sony-updr150 printer/Sony-UP-DR150
 #gptofoo pcl-2 printer/Star-LS-04
 #gptofoo pcl-2 printer/Star-LaserPrinter_8
 #gptofoo pcl-3 printer/Tally-MT908
diff --git a/src/ghost/Makefile.am b/src/ghost/Makefile.am
index 2425fb5..b4c0ef5 100644
--- a/src/ghost/Makefile.am
+++ b/src/ghost/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.37 2005/04/18 11:20:01 rlk Exp $
+## $Id: Makefile.am,v 1.38 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/ghost/Makefile.in b/src/ghost/Makefile.in
index 345fd21..6479033 100644
--- a/src/ghost/Makefile.in
+++ b/src/ghost/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
 
 # Variables
 
-SOURCES = $(ijsgutenprint_@GUTENPRINT_MAJOR_VERSION@_@GUTENPRINT_MINOR_VERSION@_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -71,8 +69,8 @@ am__DEPENDENCIES_2 =
 @BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_GHOSTSCRIPT_TRUE@	$(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -88,8 +86,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -127,7 +123,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -140,14 +135,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -282,13 +275,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -334,8 +322,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 MAINTAINERCLEANFILES = Makefile.in
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) @IJS_CFLAGS@
@@ -355,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/ghost/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/ghost/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/ghost/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/ghost/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -413,28 +399,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ijsgutenprint.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -559,7 +531,6 @@ clean: clean-am
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -585,7 +556,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/ghost/ijsgutenprint.c b/src/ghost/ijsgutenprint.c
index 06efa2a..0a11d25 100644
--- a/src/ghost/ijsgutenprint.c
+++ b/src/ghost/ijsgutenprint.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: ijsgutenprint.c,v 1.10 2005/08/10 11:29:46 rlk Exp $
+ *  $Id: ijsgutenprint.c,v 1.11 2005/10/18 02:08:16 rlk Exp $
  *
  *   IJS server for Gutenprint.
  *
@@ -90,7 +90,7 @@ static const char DeviceCMYK[] = "DeviceCMYK";
 
 static const char *version_id;
 static int version_is_ok = 1;
-static const char version_mismatch[] = N_("\
+static const char *version_mismatch = N_("\
 ijsgutenprint: the version of Gutenprint software installed (%s)\n\
   does not match the PPD file (%s).  If you have upgraded your version\n\
   of Gutenprint recently, you must reinstall all printer queues.\n\
@@ -577,7 +577,7 @@ gutenprint_set_cb (void *set_cb_data, IjsServerCtx *ctx, IjsJobId jobid,
   int code = 0;
   char vbuf[256];
   int i;
-  double z;
+  double z = 0;
   IMAGE *img = (IMAGE *)set_cb_data;
   STP_DEBUG(print_debug_setcb(key, value, value_size));
   if (value_size > sizeof(vbuf)-1)
diff --git a/src/gimp/Makefile.am b/src/gimp/Makefile.am
index 6541d80..3d0e8c0 100644
--- a/src/gimp/Makefile.am
+++ b/src/gimp/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.35 2004/09/17 18:38:13 rleigh Exp $
+## $Id: Makefile.am,v 1.36 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/gimp/Makefile.in b/src/gimp/Makefile.in
index 5cc1000..95fccd5 100644
--- a/src/gimp/Makefile.in
+++ b/src/gimp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
 
 # Variables
 
-SOURCES = $(print_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -66,8 +64,8 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 =  \
 	$(top_builddir)/src/gutenprintui/libgutenprintui.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -83,8 +81,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -122,7 +118,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -135,14 +130,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -277,13 +270,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -329,8 +317,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP_CFLAGS)
 print_SOURCES = \
@@ -355,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gimp/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gimp/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/gimp/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/gimp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -413,29 +399,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-image-gimp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -561,7 +532,6 @@ clean-am: clean-generic clean-gimp_plug_inPROGRAMS clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -587,7 +557,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gimp2/Makefile.am b/src/gimp2/Makefile.am
index 49f45fa..d470181 100644
--- a/src/gimp2/Makefile.am
+++ b/src/gimp2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2004/12/29 19:09:55 rlk Exp $
+## $Id: Makefile.am,v 1.6 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/gimp2/Makefile.in b/src/gimp2/Makefile.in
index daae3f6..fbcb0fb 100644
--- a/src/gimp2/Makefile.in
+++ b/src/gimp2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
 
 # Variables
 
-SOURCES = $(print_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -66,8 +64,8 @@ am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 =  \
 	$(top_builddir)/src/gutenprintui2/libgutenprintui2.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -83,8 +81,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -122,7 +118,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -135,14 +130,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -277,13 +270,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -329,8 +317,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 LOCAL_CPPFLAGS = $(GUTENPRINT_CFLAGS) $(GIMP2_CFLAGS)
 print_SOURCES = \
@@ -355,9 +341,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gimp2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gimp2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/gimp2/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/gimp2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -413,29 +399,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-image-gimp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -561,7 +532,6 @@ clean-am: clean-generic clean-gimp2_plug_inPROGRAMS clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -587,7 +557,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gutenprintui/Makefile.am b/src/gutenprintui/Makefile.am
index 8e4a642..215dc96 100644
--- a/src/gutenprintui/Makefile.am
+++ b/src/gutenprintui/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.4 2005/06/26 10:56:51 rleigh Exp $
+## $Id: Makefile.am,v 1.5 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/gutenprintui/Makefile.in b/src/gutenprintui/Makefile.in
index a741fb8..f9cd11b 100644
--- a/src/gutenprintui/Makefile.in
+++ b/src/gutenprintui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,8 +17,6 @@
 # Variables
 
 
-SOURCES = $(libgutenprintui_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -78,8 +76,8 @@ libgutenprintui_la_OBJECTS = $(am_libgutenprintui_la_OBJECTS)
 @BUILD_LIBGUTENPRINTUI_TRUE@am_libgutenprintui_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI_TRUE@	$(libdir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -102,8 +100,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -141,7 +137,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -154,14 +149,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -296,13 +289,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -348,8 +336,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 m4datadir = $(datadir)/aclocal
 pkgconfigdatadir = $(libdir)/pkgconfig
@@ -391,9 +377,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gutenprintui/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/gutenprintui/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -454,75 +440,32 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-panel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-plist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-printrcl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-printrcy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui_la-ui-utils.Plo@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 libgutenprintui_la-printrcy.lo: printrcy.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-printrcy.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-printrcy.Tpo" -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-printrcy.Tpo" "$(DEPDIR)/libgutenprintui_la-printrcy.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-printrcy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcy.c' object='libgutenprintui_la-printrcy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
 
 libgutenprintui_la-printrcl.lo: printrcl.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-printrcl.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-printrcl.Tpo" -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-printrcl.Tpo" "$(DEPDIR)/libgutenprintui_la-printrcl.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-printrcl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcl.c' object='libgutenprintui_la-printrcl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
 
 libgutenprintui_la-plist.lo: plist.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-plist.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-plist.Tpo" -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-plist.Tpo" "$(DEPDIR)/libgutenprintui_la-plist.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-plist.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plist.c' object='libgutenprintui_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
 
 libgutenprintui_la-panel.lo: panel.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-panel.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-panel.Tpo" -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-panel.Tpo" "$(DEPDIR)/libgutenprintui_la-panel.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-panel.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel.c' object='libgutenprintui_la-panel.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
 
 libgutenprintui_la-ui-utils.lo: ui-utils.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-ui-utils.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-ui-utils.Tpo" -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-ui-utils.Tpo" "$(DEPDIR)/libgutenprintui_la-ui-utils.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-ui-utils.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui-utils.c' object='libgutenprintui_la-ui-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
 
 libgutenprintui_la-print-image-thumbnail.lo: print-image-thumbnail.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -MT libgutenprintui_la-print-image-thumbnail.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo" -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo" "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Plo"; else rm -f "$(DEPDIR)/libgutenprintui_la-print-image-thumbnail.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print-image-thumbnail.c' object='libgutenprintui_la-print-image-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
 
 .l.c:
 	$(LEXCOMPILE) $<
@@ -694,7 +637,6 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -720,7 +662,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gutenprintui/gutenprintui-internal.h b/src/gutenprintui/gutenprintui-internal.h
index bc4d487..3eb98d8 100644
--- a/src/gutenprintui/gutenprintui-internal.h
+++ b/src/gutenprintui/gutenprintui-internal.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: gutenprintui-internal.h,v 1.1 2004/09/17 18:38:13 rleigh Exp $"
+ * "$Id: gutenprintui-internal.h,v 1.2 2005/09/17 21:54:33 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -109,6 +109,7 @@ typedef struct
 typedef struct
 {
   unsigned char *base_addr;
+  const char *output_type;
   int bpp;
   off_t offset;
   off_t limit;
diff --git a/src/gutenprintui/panel.c b/src/gutenprintui/panel.c
index ffc46ef..e6ba4db 100644
--- a/src/gutenprintui/panel.c
+++ b/src/gutenprintui/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.4 2005/08/14 16:08:29 rleigh Exp $"
+ * "$Id: panel.c,v 1.5 2005/09/17 21:54:33 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -70,6 +70,9 @@ static GtkWidget *cyan_button;
 static GtkWidget *magenta_button;
 static GtkWidget *yellow_button;
 static GtkWidget *black_button;
+static GtkWidget *red_button;
+static GtkWidget *green_button;
+static GtkWidget *blue_button;
 
 static GtkWidget *print_dialog;           /* Print dialog window */
 
@@ -142,6 +145,7 @@ static gboolean need_exposure = FALSE;
 static gboolean suppress_scaling_adjustment = FALSE;
 static gboolean suppress_scaling_callback   = FALSE;
 static gboolean thumbnail_update_pending    = FALSE;
+static gboolean thumbnail_needs_rebuild     = FALSE;
 /*
  * These are semaphores, not true booleans.
  */
@@ -253,7 +257,7 @@ static void redraw_color_swatch (void);
 static void color_update (GtkAdjustment *adjustment);
 static void dimension_update (GtkAdjustment *adjustment);
 static void set_controls_active (GtkObject *checkbutton, gpointer optno);
-static void update_adjusted_thumbnail (void);
+static void update_adjusted_thumbnail (gboolean regenerate_image);
 
 static void set_media_size(const gchar *new_media_size);
 static const stp_printer_t *tmp_printer = NULL;
@@ -384,7 +388,7 @@ open_curve_editor(GtkObject *button, gpointer xopt)
 	stp_curve_destroy(opt->info.curve.current);
       opt->info.curve.current = nseed;
       invalidate_preview_thumbnail();
-      update_adjusted_thumbnail();
+      update_adjusted_thumbnail(FALSE);
     }
 /*  gtk_window_activate_focus(GTK_WINDOW(opt->info.curve.dialog)); */
   return 1;
@@ -400,7 +404,7 @@ set_default_curve_callback(GtkObject *button, gpointer xopt)
   set_gtk_curve_values(gcurve, seed);
   set_stp_curve_values(gcurve, opt);
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -416,7 +420,7 @@ set_previous_curve_callback(GtkObject *button, gpointer xopt)
   set_gtk_curve_values(gcurve, seed);
   set_stp_curve_values(gcurve, opt);
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -434,7 +438,7 @@ set_curve_callback(GtkObject *button, gpointer xopt)
     stp_curve_destroy(opt->info.curve.current);
   opt->info.curve.current = NULL;
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -447,7 +451,7 @@ curve_draw_callback(GtkWidget *widget, GdkEvent *event, gpointer xopt)
     case GDK_BUTTON_RELEASE:
       set_stp_curve_values(widget, opt);
       invalidate_preview_thumbnail();
-      update_adjusted_thumbnail();
+      update_adjusted_thumbnail(TRUE);
       break;
     default:
       break;
@@ -461,7 +465,7 @@ curve_type_changed(GtkWidget *widget, gpointer xopt)
   option_t *opt = (option_t *)xopt;
   set_stp_curve_values(widget, opt);
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -479,7 +483,7 @@ cancel_curve_callback(GtkObject *button, gpointer xopt)
       gtk_widget_set_sensitive(GTK_WIDGET(opt->checkbox), TRUE);
       opt->info.curve.is_visible = FALSE;
       invalidate_preview_thumbnail();
-      update_adjusted_thumbnail();
+      update_adjusted_thumbnail(TRUE);
     }
   return 1;
 }
@@ -566,8 +570,7 @@ checkbox_callback(GtkObject *button, gpointer xopt)
 			    opt->info.bool.current);
   invalidate_frame();
   invalidate_preview_thumbnail();
-  if (opt->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT)
-    update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   preview_update();
   return 1;
 }
@@ -1147,7 +1150,7 @@ static void
 color_button_callback(GtkWidget *widget, gpointer data)
 {
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
 }
 
 static void
@@ -2135,6 +2138,27 @@ create_color_adjust_window (void)
   gtk_signal_connect (GTK_OBJECT (black_button), "toggled",
                       GTK_SIGNAL_FUNC (color_button_callback), NULL);
 
+  red_button = gtk_toggle_button_new_with_label(_("Red"));
+  gtk_box_pack_start(GTK_BOX(output_color_vbox), red_button, TRUE, TRUE, 0);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(red_button), TRUE);
+  gtk_widget_show(GTK_WIDGET(red_button));
+  gtk_signal_connect (GTK_OBJECT (red_button), "toggled",
+                      GTK_SIGNAL_FUNC (color_button_callback), NULL);
+
+  green_button = gtk_toggle_button_new_with_label(_("Green"));
+  gtk_box_pack_start(GTK_BOX(output_color_vbox), green_button, TRUE, TRUE,0);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(green_button), TRUE);
+  gtk_widget_show(GTK_WIDGET(green_button));
+  gtk_signal_connect (GTK_OBJECT (green_button), "toggled",
+                      GTK_SIGNAL_FUNC (color_button_callback), NULL);
+
+  blue_button = gtk_toggle_button_new_with_label(_("Blue"));
+  gtk_box_pack_start(GTK_BOX(output_color_vbox), blue_button, TRUE, TRUE, 0);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(blue_button), TRUE);
+  gtk_widget_show(GTK_WIDGET(blue_button));
+  gtk_signal_connect (GTK_OBJECT (blue_button), "toggled",
+                      GTK_SIGNAL_FUNC (color_button_callback), NULL);
+
   color_adjustment_table = gtk_table_new(1, 1, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (color_adjustment_table), 2);
   gtk_table_set_row_spacings (GTK_TABLE (color_adjustment_table), 0);
@@ -2330,7 +2354,7 @@ create_main_window (void)
   do_update_thumbnail = 1;
   build_printer_combo ();
   plist_callback (NULL, (gpointer) stpui_plist_current);
-  update_adjusted_thumbnail ();
+  update_adjusted_thumbnail (TRUE);
 
   gtk_widget_show (print_dialog);
 }
@@ -2650,7 +2674,7 @@ set_orientation(int orientation)
       preview_thumbnail_w = thumbnail_h;
       break;
     }
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(FALSE);
 }
 
 static void
@@ -2848,7 +2872,7 @@ do_color_updates (void)
 	    }
 	}
     }
-  update_adjusted_thumbnail ();
+  update_adjusted_thumbnail (TRUE);
 }
 
 static void
@@ -3101,7 +3125,7 @@ plist_callback (GtkWidget *widget,
   setup_update ();
   do_all_updates();
   suppress_preview_update--;
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   preview_update ();
 }
 
@@ -3299,7 +3323,7 @@ combo_callback(GtkWidget *widget, gpointer data)
 	set_media_size(new_value);
       g_idle_add(refresh_all_options, NULL);
       if (option->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT)
-	update_adjusted_thumbnail();
+	update_adjusted_thumbnail(TRUE);
       preview_update();
     }
 }
@@ -3338,7 +3362,7 @@ output_type_callback (GtkWidget *widget,
 	gtk_widget_show(output_color_vbox);
       stp_set_string_parameter(pv->v, "PrintingMode", (const char *) data);
       invalidate_preview_thumbnail ();
-      update_adjusted_thumbnail ();
+      update_adjusted_thumbnail (TRUE);
       set_options_active(NULL);
       preview_update ();
       do_all_updates();
@@ -3850,18 +3874,77 @@ fill_buffer_writefunc(void *priv, const char *buffer, size_t bytes)
 {
   int mask = 0;
   int i;
-  int pixels = bytes / 4;
+
   priv_t *p = (priv_t *) priv;
   unsigned char *where = p->base_addr + p->offset;
   const unsigned char *xbuffer = (const unsigned char *)buffer;
 
-  if (p->bpp == 1)
+  if (strcmp(p->output_type, "Whitescale") == 0)
+    {
+      memcpy(where, xbuffer, bytes);
+      p->offset += bytes;
+    }
+  else if (strcmp(p->output_type, "Grayscale") == 0)
     {
-      memcpy(where, buffer, bytes);
+      for (i = 0; i < bytes; i++)
+	where[i] = ~xbuffer[i];
       p->offset += bytes;
     }
+  else if (strcmp(p->output_type, "RGB") == 0)
+    {
+      int pixels = bytes / 3;
+      if (bytes + p->offset > p->limit)
+	bytes = p->limit - p->offset;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(red_button)))
+	mask |= 1;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(green_button)))
+	mask |= 2;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(blue_button)))
+	mask |= 4;
+
+      memset(where, 0, pixels * 3);
+      for (i = 0; i < pixels; i++)
+	{
+	  if (mask & 1)
+	    where[0] = xbuffer[0];
+	  if (mask & 2)
+	    where[1] = xbuffer[1];
+	  if (mask & 4)
+	    where[2] = xbuffer[2];
+	  where += 3;
+	  xbuffer += 3;
+	}
+      p->offset += pixels * 3;
+    }
+  else if (strcmp(p->output_type, "CMY") == 0)
+    {
+      int pixels = bytes / 3;
+      if (bytes + p->offset > p->limit)
+	bytes = p->limit - p->offset;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cyan_button)))
+	mask |= 1;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(magenta_button)))
+	mask |= 2;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(yellow_button)))
+	mask |= 4;
+
+      memset(where, 0xff, pixels * 3);
+      for (i = 0; i < pixels; i++)
+	{
+	  if (mask & 1)
+	    where[0] = -xbuffer[0];
+	  if (mask & 2)
+	    where[1] = -xbuffer[1];
+	  if (mask & 4)
+	    where[2] = -xbuffer[2];
+	  where += 3;
+	  xbuffer += 3;
+	}
+      p->offset += pixels * 3;
+    }
   else
     {
+      int pixels = bytes / 4;
       if (bytes + p->offset > p->limit)
 	bytes = p->limit - p->offset;
       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cyan_button)))
@@ -4038,7 +4121,7 @@ compute_thumbnail(const stp_vars_t *v)
   stp_image_t *im = stpui_image_thumbnail_new(thumbnail_data, thumbnail_w,
 					      thumbnail_h, thumbnail_bpp);
   stp_vars_t *nv = stp_vars_create_copy(v);
-  stp_set_driver(nv, "raw-data-8");
+  const char *output_type = stp_describe_output(nv);
   stp_set_top(nv, 0);
   stp_set_left(nv, 0);
   stp_set_width(nv, thumbnail_w);
@@ -4047,18 +4130,65 @@ compute_thumbnail(const stp_vars_t *v)
   stp_set_outdata(nv, &priv);
   stp_set_errfunc(nv, stpui_get_errfunc());
   stp_set_errdata(nv, stpui_get_errdata());
-  if (!print_mode_is_color(nv))
+  if (strcmp(output_type, "Whitescale") == 0)
     {
+      gtk_widget_hide(output_color_vbox);
       priv.bpp = 1;
+      priv.output_type = "Whitescale";
       stp_set_string_parameter(nv, "InkType", "RGBGray");
     }
+  else if (strcmp(output_type, "Grayscale") == 0)
+    {
+      gtk_widget_hide(output_color_vbox);
+      priv.bpp = 1;
+      priv.output_type = "Grayscale";
+      stp_set_string_parameter(nv, "InkType", "CMYGray");
+    }
+  else if (strcmp(output_type, "CMY") == 0)
+    {
+      gtk_widget_hide(black_button);
+      gtk_widget_hide(red_button);
+      gtk_widget_hide(green_button);
+      gtk_widget_hide(blue_button);
+      gtk_widget_show(cyan_button);
+      gtk_widget_show(magenta_button);
+      gtk_widget_show(yellow_button);
+      gtk_widget_show(output_color_vbox);
+      priv.bpp = 3;
+      priv.output_type = "CMY";
+      stp_set_string_parameter(nv, "InkType", "CMY");
+    }
+  else if (strcmp(output_type, "RGB") == 0)
+    {
+      gtk_widget_hide(cyan_button);
+      gtk_widget_hide(magenta_button);
+      gtk_widget_hide(yellow_button);
+      gtk_widget_hide(black_button);
+      gtk_widget_show(red_button);
+      gtk_widget_show(green_button);
+      gtk_widget_show(blue_button);
+      gtk_widget_show(output_color_vbox);
+      priv.bpp = 3;
+      priv.output_type = "RGB";
+      stp_set_string_parameter(nv, "InkType", "RGB");
+    }
   else
     {
+      gtk_widget_hide(red_button);
+      gtk_widget_hide(green_button);
+      gtk_widget_hide(blue_button);
+      gtk_widget_show(cyan_button);
+      gtk_widget_show(magenta_button);
+      gtk_widget_show(yellow_button);
+      gtk_widget_show(black_button);
+      gtk_widget_show(output_color_vbox);
       priv.bpp = 4;
+      priv.output_type = "CMYK";
       stp_set_string_parameter(nv, "InkType", "CMYK");
     }
   stp_set_page_height(nv, thumbnail_h);
   stp_set_page_width(nv, thumbnail_w);
+  stp_set_driver(nv, "raw-data-8");
   stp_set_float_parameter(nv, "Density", 1.0);
   stp_set_float_parameter(nv, "InkLimit", 0);
   stp_set_string_parameter(nv, "InputImageType", "RGB");
@@ -4073,6 +4203,7 @@ compute_thumbnail(const stp_vars_t *v)
       fprintf(stderr, "Could not print thumbnail!\n");
     }
   stp_vars_destroy(nv);
+  thumbnail_needs_rebuild = FALSE;
   return answer;
 }
 
@@ -4117,21 +4248,6 @@ set_thumbnail_orientation(void)
 }
 
 static void
-update_adjusted_thumbnail (void)
-{
-  if (thumbnail_data && adjusted_thumbnail_data && do_update_thumbnail &&
-      suppress_preview_update == 0)
-    {
-      if (compute_thumbnail(pv->v))
-	{
-	  set_thumbnail_orientation();
-	  redraw_color_swatch ();
-	  preview_update ();
-	}
-    }
-}
-
-static void
 draw_arrow (GdkWindow *w,
             GdkGC     *gc,
             gint       paper_left,
@@ -4414,13 +4530,30 @@ do_preview_thumbnail (void)
 static gboolean
 idle_preview_thumbnail(gpointer data)
 {
-  set_orientation(pv->orientation);
-  do_preview_thumbnail();
+  if (thumbnail_data && adjusted_thumbnail_data && do_update_thumbnail)
+    {
+      thumbnail_update_pending = TRUE;
+      set_orientation(pv->orientation);
+      if (thumbnail_needs_rebuild && compute_thumbnail(pv->v))
+	{
+	  set_thumbnail_orientation();
+	  redraw_color_swatch ();
+	}
+      do_preview_thumbnail();
+    }
   thumbnail_update_pending = FALSE;
   return FALSE;
 }
 
 static void
+update_adjusted_thumbnail (gboolean regenerate_image)
+{
+  if (regenerate_image)
+    thumbnail_needs_rebuild = TRUE;
+  preview_update ();
+}
+
+static void
 preview_expose (void)
 {
   need_exposure = TRUE;
@@ -4693,7 +4826,7 @@ color_update (GtkAdjustment *adjustment)
 	    {
 	      stp_set_float_parameter(pv->v, opt->fast_desc->name,
 				      adjustment->value);
-	      update_adjusted_thumbnail();
+	      update_adjusted_thumbnail(TRUE);
 	    }
 	}
     }
@@ -4718,7 +4851,7 @@ dimension_update (GtkAdjustment *adjustment)
 	    {
 	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
 					  adjustment->value * unit_scaler);
-	      update_adjusted_thumbnail();
+	      update_adjusted_thumbnail(FALSE);
 	    }
 	}
     }
@@ -4838,7 +4971,7 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	}
     }
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
 }
 
 static void
diff --git a/src/gutenprintui/printrcl.c b/src/gutenprintui/printrcl.c
index e1718e4..ee98f73 100644
--- a/src/gutenprintui/printrcl.c
+++ b/src/gutenprintui/printrcl.c
@@ -1,32 +1,85 @@
-/* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- */
+#line 3 "printrcl.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
 
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
 #endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -34,34 +87,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -76,71 +112,71 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE yyrestart(yyin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
+#endif
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
 extern int yyleng;
+
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -177,12 +213,16 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -196,23 +236,33 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
 int yyleng;
 
 /* Points to current character in buffer. */
@@ -225,69 +275,93 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define yywrap() 1
+#define yywrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
+
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
 typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 40
 #define YY_END_OF_BUFFER 41
-static yyconst short int yy_accept[335] =
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -328,7 +402,7 @@ static yyconst short int yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -360,7 +434,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[39] =
+static yyconst flex_int32_t yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -368,7 +442,7 @@ static yyconst int yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst short int yy_base[340] =
+static yyconst flex_int16_t yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -409,7 +483,7 @@ static yyconst short int yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst short int yy_def[340] =
+static yyconst flex_int16_t yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -450,7 +524,7 @@ static yyconst short int yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst short int yy_nxt[414] =
+static yyconst flex_int16_t yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -500,7 +574,7 @@ static yyconst short int yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst short int yy_chk[414] =
+static yyconst flex_int16_t yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -553,6 +627,9 @@ static yyconst short int yy_chk[414] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -562,7 +639,6 @@ static char *yy_last_accepting_cpos;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "printrcl.l"
-#define INITIAL 0
 /*		-*-Mode: C-*-
  * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
  *
@@ -621,7 +697,21 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 625 "printrcl.c"
+#line 701 "printrcl.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -629,65 +719,30 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
+extern int yywrap (void );
 #endif
 #endif
 
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+    static void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
+
 #ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
+static int yyinput (void );
 #else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
+static int input (void );
 #endif
 
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -696,7 +751,6 @@ YY_MALLOC_DECL
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -709,9 +763,10 @@ YY_MALLOC_DECL
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -721,9 +776,22 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -744,12 +812,18 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -766,27 +840,29 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
+    
 #line 73 "printrcl.l"
 
 
-#line 779 "printrcl.c"
+#line 855 "printrcl.c"
 
-	if ( yy_init )
+	if ( (yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 0;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -794,34 +870,36 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		yy_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -838,24 +916,22 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			goto yy_find_action;
 
 case 1:
@@ -1019,6 +1095,7 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 33:
+/* rule 33 can match eol */
 YY_RULE_SETUP
 #line 109 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
@@ -1034,6 +1111,7 @@ YY_RULE_SETUP
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 36:
+/* rule 36 can match eol */
 YY_RULE_SETUP
 #line 112 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
@@ -1049,6 +1127,7 @@ YY_RULE_SETUP
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 39:
+/* rule 39 can match eol */
 YY_RULE_SETUP
 #line 115 "printrcl.l"
 DBG(newline); mylineno++;
@@ -1058,33 +1137,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1062 "printrcl.c"
+#line 1141 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1094,13 +1173,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1113,30 +1192,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_c_buf_p);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1147,7 +1226,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1155,30 +1234,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1189,8 +1268,7 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1199,21 +1277,20 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1233,34 +1310,30 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1273,8 +1346,7 @@ static int yy_get_next_buffer()
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1284,35 +1356,35 @@ static int yy_get_next_buffer()
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			yyrestart(yyin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1320,32 +1392,31 @@ static int yy_get_next_buffer()
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1357,30 +1428,23 @@ static yy_state_type yy_get_previous_state()
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1392,80 +1456,73 @@ yy_state_type yy_current_state;
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
-
+}
 
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1479,16 +1536,16 @@ static int input()
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					yyrestart(yyin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( yywrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1498,90 +1555,92 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1590,80 +1649,75 @@ int size;
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	yy_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
+		yyfree((void *) b->yy_ch_buf  );
 
+	yyfree((void *) b  );
+}
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1680,29 +1734,121 @@ YY_BUFFER_STATE b;
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
 
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1716,47 +1862,43 @@ yy_size_t size;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	yy_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * @param yy_str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
+{
+    
+	return yy_scan_bytes(yy_str,strlen(yy_str) );
+}
 
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1765,7 +1907,7 @@ int len;
 
 	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = yy_scan_buffer(buf,n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1775,148 +1917,164 @@ int len;
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
+}
 
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
 #endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Redefine yyless() so it works in section 3 code. */
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/* Accessor  methods (get/set functions) to struct members. */
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
 
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+/** Get the current token.
+ * 
+ */
 
+char *yyget_text  (void)
+{
+        return yytext;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
 
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
 
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
 
-/* Redefine yyless() so it works in section 3 code. */
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
 
+    return 0;
+}
 
-/* Internal utility routines. */
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
-	for ( i = 0; i < n; ++i )
+    	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
-	for ( n = 0; s[n]; ++n )
+    	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *yyalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1925,23 +2083,25 @@ yy_size_t size;
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
 #endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui/printrcy.c b/src/gutenprintui/printrcy.c
index 1609566..a0a27da 100644
--- a/src/gutenprintui/printrcy.c
+++ b/src/gutenprintui/printrcy.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    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
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -36,6 +36,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.1"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -93,6 +96,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -183,6 +187,11 @@ static stpui_plist_t *current_printer = NULL;
 # define YYERROR_VERBOSE 0
 #endif
 
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -195,22 +204,48 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 199 "printrcy.c"
+/* Line 219 of yacc.c.  */
+#line 209 "printrcy.c"
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if defined (__STDC__) || defined (__cplusplus)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     define YYINCLUDED_STDLIB_H
 #    endif
 #   endif
 #  endif
@@ -219,25 +254,51 @@ typedef int YYSTYPE;
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  short int yyss;
   YYSTYPE yyvs;
   };
 
@@ -247,20 +308,20 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined (__GNUC__) && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -289,7 +350,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short yysigned_char;
+   typedef short int yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -310,7 +371,7 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   295
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
@@ -389,7 +450,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const unsigned short int yyrline[] =
 {
        0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
      168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
@@ -402,37 +463,37 @@ static const unsigned short yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", 
-  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", 
-  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", 
-  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", 
-  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", 
-  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", 
-  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", 
-  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", 
-  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", 
-  "Queue_Name", "Output_Filename", "Extra_Printer_Options", 
-  "Custom_Command", "Command_Type", "Scaling", "Orientation", 
-  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", 
-  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", 
-  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", 
-  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", 
-  "Parameters", "Standard_Value", "Standard_Values", "A_Printer", 
-  "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", 
-  "Old_Globals", "New_Global_Setting", "Global_Setting", 
-  "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION",
+  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER",
+  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING",
+  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP",
+  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR",
+  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS",
+  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL",
+  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE",
+  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination",
+  "Queue_Name", "Output_Filename", "Extra_Printer_Options",
+  "Custom_Command", "Command_Type", "Scaling", "Orientation",
+  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type",
+  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param",
+  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param",
+  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters",
+  "Standard_Value", "Standard_Values", "A_Printer", "Printers",
+  "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals",
+  "New_Global_Setting", "Global_Setting", "Global_Settings",
+  "Global_Subblock", "Global_Block", "Thing", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -573,22 +634,6 @@ static const unsigned char yystos[] =
        4,     3,     6,     7
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -596,7 +641,8 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
+
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -617,26 +663,59 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (N)								\
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (0)
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+              (Loc).first_line, (Loc).first_column,	\
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -659,36 +738,30 @@ do {						\
     YYFPRINTF Args;				\
 } while (0)
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
 do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
+      yysymprint (stderr,					\
+                  Type, Value);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    short int *bottom;
+    short int *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -718,13 +791,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
+             yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
@@ -738,8 +811,7 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -754,13 +826,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -782,7 +850,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  register const char *yys = yystr;
+  const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -807,8 +875,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -818,7 +886,55 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+#endif /* YYERROR_VERBOSE */
 
 
 
@@ -842,15 +958,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
   switch (yytype)
     {
       default:
@@ -866,10 +982,11 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -877,6 +994,10 @@ yydestruct (yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
   switch (yytype)
     {
 
@@ -904,10 +1025,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -933,17 +1054,17 @@ yyparse (void)
 #else
 int
 yyparse ()
-
+    ;
 #endif
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -955,14 +1076,14 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  short int *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
@@ -1019,14 +1140,14 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1037,21 +1158,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1083,18 +1204,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1109,7 +1230,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1129,8 +1250,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1182,27 +1303,27 @@ yyreduce:
         case 2:
 #line 101 "printrcy.y"
     {
-	  current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  current_printer = stpui_plist_create((yyvsp[-1].sval), (yyvsp[0].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 3:
 #line 112 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
-	    g_free(yyvsp[0].sval);
+	  if ((yyvsp[0].sval))
+	    g_free((yyvsp[0].sval));
 	}
     break;
 
   case 4:
 #line 119 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_queue_name(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_queue_name(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1210,10 +1331,10 @@ yyreduce:
   case 5:
 #line 129 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_output_filename(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_output_filename(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1221,10 +1342,10 @@ yyreduce:
   case 6:
 #line 139 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_extra_printer_options(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1232,10 +1353,10 @@ yyreduce:
   case 7:
 #line 149 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_custom_command(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_custom_command(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1243,44 +1364,44 @@ yyreduce:
   case 8:
 #line 159 "printrcy.y"
     {
-	  stpui_plist_set_command_type(current_printer, yyvsp[0].ival);
+	  stpui_plist_set_command_type(current_printer, (yyvsp[0].ival));
 	}
     break;
 
   case 9:
 #line 165 "printrcy.y"
-    { current_printer->scaling = yyvsp[0].dval; }
+    { current_printer->scaling = (yyvsp[0].dval); }
     break;
 
   case 10:
 #line 169 "printrcy.y"
-    { current_printer->orientation = yyvsp[0].ival; }
+    { current_printer->orientation = (yyvsp[0].ival); }
     break;
 
   case 11:
 #line 173 "printrcy.y"
-    { current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; }
+    { current_printer->auto_size_roll_feed_paper = (yyvsp[0].ival); }
     break;
 
   case 12:
 #line 177 "printrcy.y"
-    { current_printer->unit = yyvsp[0].ival; }
+    { current_printer->unit = (yyvsp[0].ival); }
     break;
 
   case 13:
 #line 181 "printrcy.y"
-    { stp_set_left(current_printer->v, yyvsp[0].ival); }
+    { stp_set_left(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 14:
 #line 185 "printrcy.y"
-    { stp_set_top(current_printer->v, yyvsp[0].ival); }
+    { stp_set_top(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 15:
 #line 189 "printrcy.y"
     {
-	  switch (yyvsp[0].ival)
+	  switch ((yyvsp[0].ival))
 	    {
 	    case 0:
 	      stp_set_string_parameter
@@ -1298,164 +1419,165 @@ yyreduce:
 
   case 16:
 #line 207 "printrcy.y"
-    { stp_set_page_width(current_printer->v, yyvsp[0].ival); }
+    { stp_set_page_width(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 17:
 #line 211 "printrcy.y"
-    { stp_set_page_height(current_printer->v, yyvsp[0].ival); }
+    { stp_set_page_height(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 19:
 #line 218 "printrcy.y"
     {
-	  stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_int_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					 STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					 STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
   case 20:
 #line 232 "printrcy.y"
     {
-	  stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_string_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					    STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					    STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 21:
 #line 247 "printrcy.y"
     {
-	  stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_file_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					  STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					  STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 22:
 #line 262 "printrcy.y"
     {
-	  stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_float_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].dval));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					   STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					   STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
   case 23:
 #line 276 "printrcy.y"
     {
-	  stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_dimension_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
   case 24:
 #line 290 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "False") == 0)
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0);
+	  if (strcmp((yyvsp[0].sval), "False") == 0)
+	    stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 0);
 	  else
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 1);
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					     STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					     STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 25:
 #line 308 "printrcy.y"
     {
-	  stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval);
+	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[0].sval));
 	  if (curve)
 	    {
-	      stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve);
-	      if (strcmp(yyvsp[-1].sval, "False") == 0)
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
+	      stp_set_curve_parameter(current_printer->v, (yyvsp[-3].sval), curve);
+	      if (strcmp((yyvsp[-1].sval), "False") == 0)
+		stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_INACTIVE);
 	      else
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
+		stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_ACTIVE);
 	      stp_curve_destroy(curve);
 	    }
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 56:
 #line 353 "printrcy.y"
-    { stpui_printrc_current_printer = yyvsp[0].sval; }
+    { stpui_printrc_current_printer = (yyvsp[0].sval); }
     break;
 
   case 57:
 #line 357 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "True") == 0)
+	  if (strcmp((yyvsp[0].sval), "True") == 0)
 	    stpui_show_all_paper_sizes = 1;
 	  else
 	    stpui_show_all_paper_sizes = 0;
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 61:
 #line 373 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_set_global_parameter((yyvsp[-1].sval), (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
 
+      default: break;
     }
 
-/* Line 991 of yacc.c.  */
-#line 1458 "printrcy.c"
+/* Line 1126 of yacc.c.  */
+#line 1581 "printrcy.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1494,104 +1616,153 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
+	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+	  YYSIZE_T yysize = yysize0;
+	  YYSIZE_T yysize1;
+	  int yysize_overflow = 0;
+	  char *yymsg = 0;
+#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+	  int yyx;
+
+#if 0
+	  /* This is so xgettext sees the translatable formats that are
+	     constructed on the fly.  */
+	  YY_("syntax error, unexpected %s");
+	  YY_("syntax error, unexpected %s, expecting %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+	  char *yyfmt;
+	  char const *yyf;
+	  static char const yyunexpected[] = "syntax error, unexpected %s";
+	  static char const yyexpecting[] = ", expecting %s";
+	  static char const yyor[] = " or %s";
+	  char yyformat[sizeof yyunexpected
+			+ sizeof yyexpecting - 1
+			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+			   * (sizeof yyor - 1))];
+	  char const *yyprefix = yyexpecting;
 
-	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 1;
+
+	  yyarg[0] = yytname[yytype];
+	  yyfmt = yystpcpy (yyformat, yyunexpected);
+
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
+	      {
+		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+		  {
+		    yycount = 1;
+		    yysize = yysize0;
+		    yyformat[sizeof yyunexpected - 1] = '\0';
+		    break;
+		  }
+		yyarg[yycount++] = yytname[yyx];
+		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+		yysize_overflow |= yysize1 < yysize;
+		yysize = yysize1;
+		yyfmt = yystpcpy (yyfmt, yyprefix);
+		yyprefix = yyor;
+	      }
+
+	  yyf = YY_(yyformat);
+	  yysize1 = yysize + yystrlen (yyf);
+	  yysize_overflow |= yysize1 < yysize;
+	  yysize = yysize1;
+
+	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+	    yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg)
 	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
+	      /* Avoid sprintf, as that infringes on the user's name space.
+		 Don't have undefined behavior even if the translation
+		 produced a string with the wrong number of "%s"s.  */
+	      char *yyp = yymsg;
+	      int yyi = 0;
+	      while ((*yyp = *yyf))
 		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
+		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		    {
+		      yyp += yytnamerr (yyp, yyarg[yyi++]);
+		      yyf += 2;
+		    }
+		  else
+		    {
+		      yyp++;
+		      yyf++;
+		    }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
+	    {
+	      yyerror (YY_("syntax error"));
+	      goto yyexhaustedlab;
+	    }
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	yyerror (YY_("syntax error"));
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
+      if (yychar <= YYEOF)
         {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
         }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      else
+	{
+	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
-  goto yyerrlab2;
+  goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-
-  /* Suppress GCC warning that yyerrlab1 is unused when no action
-     invokes YYERROR.  */
-#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
-    && !defined __cplusplus
-  __attribute__ ((__unused__))
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (0)
+     goto yyerrorlab;
 
-  goto yyerrlab2;
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrlab2 -- pop states until the error token can be shifted.  |
-`---------------------------------------------------------------*/
-yyerrlab2:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1612,22 +1783,22 @@ yyerrlab2:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1647,16 +1818,25 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK;
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
diff --git a/src/gutenprintui/printrcy.h b/src/gutenprintui/printrcy.h
index afa662b..a1ebec0 100644
--- a/src/gutenprintui/printrcy.h
+++ b/src/gutenprintui/printrcy.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    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
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -69,6 +69,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
diff --git a/src/gutenprintui2/Makefile.am b/src/gutenprintui2/Makefile.am
index 6b93566..2b49f89 100644
--- a/src/gutenprintui2/Makefile.am
+++ b/src/gutenprintui2/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.5 2005/06/26 10:56:51 rleigh Exp $
+## $Id: Makefile.am,v 1.6 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/gutenprintui2/Makefile.in b/src/gutenprintui2/Makefile.in
index 3a43db9..0c0cecb 100644
--- a/src/gutenprintui2/Makefile.in
+++ b/src/gutenprintui2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,8 +17,6 @@
 # Variables
 
 
-SOURCES = $(libgutenprintui2_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -80,8 +78,8 @@ libgutenprintui2_la_OBJECTS = $(am_libgutenprintui2_la_OBJECTS)
 @BUILD_LIBGUTENPRINTUI2_TRUE@am_libgutenprintui2_la_rpath = -rpath \
 @BUILD_LIBGUTENPRINTUI2_TRUE@	$(libdir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -104,8 +102,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -143,7 +139,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -156,14 +151,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -298,13 +291,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -350,8 +338,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 m4datadir = $(datadir)/aclocal
 pkgconfigdatadir = $(libdir)/pkgconfig
@@ -405,9 +391,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/gutenprintui2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui2/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/gutenprintui2/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/gutenprintui2/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -468,99 +454,41 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-curve.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-panel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-plist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-printrcy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 libgutenprintui2_la-printrcy.lo: printrcy.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-printrcy.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-printrcy.Tpo" -c -o libgutenprintui2_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-printrcy.Tpo" "$(DEPDIR)/libgutenprintui2_la-printrcy.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-printrcy.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcy.c' object='libgutenprintui2_la-printrcy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcy.lo `test -f 'printrcy.c' || echo '$(srcdir)/'`printrcy.c
 
 libgutenprintui2_la-printrcl.lo: printrcl.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-printrcl.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-printrcl.Tpo" -c -o libgutenprintui2_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-printrcl.Tpo" "$(DEPDIR)/libgutenprintui2_la-printrcl.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-printrcl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='printrcl.c' object='libgutenprintui2_la-printrcl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-printrcl.lo `test -f 'printrcl.c' || echo '$(srcdir)/'`printrcl.c
 
 libgutenprintui2_la-panel.lo: panel.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-panel.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-panel.Tpo" -c -o libgutenprintui2_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-panel.Tpo" "$(DEPDIR)/libgutenprintui2_la-panel.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-panel.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='panel.c' object='libgutenprintui2_la-panel.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-panel.lo `test -f 'panel.c' || echo '$(srcdir)/'`panel.c
 
 libgutenprintui2_la-plist.lo: plist.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-plist.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-plist.Tpo" -c -o libgutenprintui2_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-plist.Tpo" "$(DEPDIR)/libgutenprintui2_la-plist.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-plist.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='plist.c' object='libgutenprintui2_la-plist.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-plist.lo `test -f 'plist.c' || echo '$(srcdir)/'`plist.c
 
 libgutenprintui2_la-ui-utils.lo: ui-utils.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-ui-utils.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo" -c -o libgutenprintui2_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo" "$(DEPDIR)/libgutenprintui2_la-ui-utils.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-ui-utils.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ui-utils.c' object='libgutenprintui2_la-ui-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-ui-utils.lo `test -f 'ui-utils.c' || echo '$(srcdir)/'`ui-utils.c
 
 libgutenprintui2_la-print-image-thumbnail.lo: print-image-thumbnail.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-print-image-thumbnail.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo" -c -o libgutenprintui2_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo" "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-print-image-thumbnail.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='print-image-thumbnail.c' object='libgutenprintui2_la-print-image-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-print-image-thumbnail.lo `test -f 'print-image-thumbnail.c' || echo '$(srcdir)/'`print-image-thumbnail.c
 
 libgutenprintui2_la-curve.lo: curve.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-curve.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-curve.Tpo" -c -o libgutenprintui2_la-curve.lo `test -f 'curve.c' || echo '$(srcdir)/'`curve.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-curve.Tpo" "$(DEPDIR)/libgutenprintui2_la-curve.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-curve.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='curve.c' object='libgutenprintui2_la-curve.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-curve.lo `test -f 'curve.c' || echo '$(srcdir)/'`curve.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-curve.lo `test -f 'curve.c' || echo '$(srcdir)/'`curve.c
 
 libgutenprintui2_la-gammacurve.lo: gammacurve.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-gammacurve.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo" -c -o libgutenprintui2_la-gammacurve.lo `test -f 'gammacurve.c' || echo '$(srcdir)/'`gammacurve.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo" "$(DEPDIR)/libgutenprintui2_la-gammacurve.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-gammacurve.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gammacurve.c' object='libgutenprintui2_la-gammacurve.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-gammacurve.lo `test -f 'gammacurve.c' || echo '$(srcdir)/'`gammacurve.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-gammacurve.lo `test -f 'gammacurve.c' || echo '$(srcdir)/'`gammacurve.c
 
 libgutenprintui2_la-typebuiltins.lo: typebuiltins.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -MT libgutenprintui2_la-typebuiltins.lo -MD -MP -MF "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo" -c -o libgutenprintui2_la-typebuiltins.lo `test -f 'typebuiltins.c' || echo '$(srcdir)/'`typebuiltins.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo" "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Plo"; else rm -f "$(DEPDIR)/libgutenprintui2_la-typebuiltins.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='typebuiltins.c' object='libgutenprintui2_la-typebuiltins.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-typebuiltins.lo `test -f 'typebuiltins.c' || echo '$(srcdir)/'`typebuiltins.c
+	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgutenprintui2_la_CFLAGS) $(CFLAGS) -c -o libgutenprintui2_la-typebuiltins.lo `test -f 'typebuiltins.c' || echo '$(srcdir)/'`typebuiltins.c
 
 .l.c:
 	$(LEXCOMPILE) $<
@@ -732,7 +660,6 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -758,7 +685,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/gutenprintui2/gutenprintui-internal.h b/src/gutenprintui2/gutenprintui-internal.h
index 1ff37de..af3caae 100644
--- a/src/gutenprintui2/gutenprintui-internal.h
+++ b/src/gutenprintui2/gutenprintui-internal.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: gutenprintui-internal.h,v 1.2 2005/04/09 14:52:34 rlk Exp $"
+ * "$Id: gutenprintui-internal.h,v 1.3 2005/09/17 21:54:33 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -109,6 +109,7 @@ typedef struct
 typedef struct
 {
   unsigned char *base_addr;
+  const char *output_type;
   int bpp;
   off_t offset;
   off_t limit;
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index 8fc3c42..df2fdb6 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: panel.c,v 1.5 2005/08/14 16:08:29 rleigh Exp $"
+ * "$Id: panel.c,v 1.7 2005/10/06 02:19:53 rlk Exp $"
  *
  *   Main window code for Print plug-in for the GIMP.
  *
@@ -70,6 +70,9 @@ static GtkWidget *cyan_button;
 static GtkWidget *magenta_button;
 static GtkWidget *yellow_button;
 static GtkWidget *black_button;
+static GtkWidget *red_button;
+static GtkWidget *green_button;
+static GtkWidget *blue_button;
 
 static GtkWidget *print_dialog;           /* Print dialog window */
 
@@ -142,6 +145,7 @@ static gboolean need_exposure = FALSE;
 static gboolean suppress_scaling_adjustment = FALSE;
 static gboolean suppress_scaling_callback   = FALSE;
 static gboolean thumbnail_update_pending    = FALSE;
+static gboolean thumbnail_needs_rebuild     = FALSE;
 /*
  * These are semaphores, not true booleans.
  */
@@ -253,7 +257,7 @@ static void redraw_color_swatch (void);
 static void color_update (GtkAdjustment *adjustment);
 static void dimension_update (GtkAdjustment *adjustment);
 static void set_controls_active (GtkObject *checkbutton, gpointer optno);
-static void update_adjusted_thumbnail (void);
+static void update_adjusted_thumbnail (gboolean regenerate_image);
 
 static void set_media_size(const gchar *new_media_size);
 static const stp_printer_t *tmp_printer = NULL;
@@ -384,7 +388,7 @@ open_curve_editor(GtkObject *button, gpointer xopt)
 	stp_curve_destroy(opt->info.curve.current);
       opt->info.curve.current = nseed;
       invalidate_preview_thumbnail();
-      update_adjusted_thumbnail();
+      update_adjusted_thumbnail(FALSE);
     }
 /*  gtk_window_activate_focus(GTK_WINDOW(opt->info.curve.dialog)); */
   return 1;
@@ -400,7 +404,7 @@ set_default_curve_callback(GtkObject *button, gpointer xopt)
   set_stpui_curve_values(gcurve, seed);
   set_stp_curve_values(gcurve, opt);
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -416,7 +420,7 @@ set_previous_curve_callback(GtkObject *button, gpointer xopt)
   set_stpui_curve_values(gcurve, seed);
   set_stp_curve_values(gcurve, opt);
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -434,7 +438,7 @@ set_curve_callback(GtkObject *button, gpointer xopt)
     stp_curve_destroy(opt->info.curve.current);
   opt->info.curve.current = NULL;
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -447,7 +451,7 @@ curve_draw_callback(GtkWidget *widget, GdkEvent *event, gpointer xopt)
     case GDK_BUTTON_RELEASE:
       set_stp_curve_values(widget, opt);
       invalidate_preview_thumbnail();
-      update_adjusted_thumbnail();
+      update_adjusted_thumbnail(TRUE);
       break;
     default:
       break;
@@ -461,7 +465,7 @@ curve_type_changed(GtkWidget *widget, gpointer xopt)
   option_t *opt = (option_t *)xopt;
   set_stp_curve_values(widget, opt);
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   return 1;
 }
 
@@ -479,7 +483,7 @@ cancel_curve_callback(GtkObject *button, gpointer xopt)
       gtk_widget_set_sensitive(GTK_WIDGET(opt->checkbox), TRUE);
       opt->info.curve.is_visible = FALSE;
       invalidate_preview_thumbnail();
-      update_adjusted_thumbnail();
+      update_adjusted_thumbnail(TRUE);
     }
   return 1;
 }
@@ -567,8 +571,7 @@ checkbox_callback(GtkObject *button, gpointer xopt)
 			    opt->info.bool.current);
   invalidate_frame();
   invalidate_preview_thumbnail();
-  if (opt->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT)
-    update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   preview_update();
   return 1;
 }
@@ -1148,7 +1151,7 @@ static void
 color_button_callback(GtkWidget *widget, gpointer data)
 {
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
 }
 
 static void
@@ -2133,6 +2136,27 @@ create_color_adjust_window (void)
   g_signal_connect (G_OBJECT (black_button), "toggled",
 		    G_CALLBACK (color_button_callback), NULL);
 
+  red_button = gtk_toggle_button_new_with_label(_("Red"));
+  gtk_box_pack_start(GTK_BOX(output_color_vbox), red_button, TRUE, TRUE, 0);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(red_button), TRUE);
+  gtk_widget_show(GTK_WIDGET(red_button));
+  g_signal_connect (G_OBJECT (red_button), "toggled",
+		    G_CALLBACK (color_button_callback), NULL);
+
+  green_button = gtk_toggle_button_new_with_label(_("Green"));
+  gtk_box_pack_start(GTK_BOX(output_color_vbox), green_button, TRUE, TRUE,0);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(green_button), TRUE);
+  gtk_widget_show(GTK_WIDGET(green_button));
+  g_signal_connect (G_OBJECT (green_button), "toggled",
+		    G_CALLBACK (color_button_callback), NULL);
+
+  blue_button = gtk_toggle_button_new_with_label(_("Blue"));
+  gtk_box_pack_start(GTK_BOX(output_color_vbox), blue_button, TRUE, TRUE, 0);
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(blue_button), TRUE);
+  gtk_widget_show(GTK_WIDGET(blue_button));
+  g_signal_connect (G_OBJECT (blue_button), "toggled",
+		    G_CALLBACK (color_button_callback), NULL);
+
   color_adjustment_table = gtk_table_new(1, 1, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (color_adjustment_table), 2);
   gtk_table_set_row_spacings (GTK_TABLE (color_adjustment_table), 0);
@@ -2336,7 +2360,7 @@ create_main_window (void)
   do_update_thumbnail = 1;
   build_printer_combo ();
   plist_callback (NULL, (gpointer) stpui_plist_current);
-  update_adjusted_thumbnail ();
+  update_adjusted_thumbnail (TRUE);
 
   /* The initial size request does not account for the
      GtkScrolledWindow. */
@@ -2674,7 +2698,7 @@ set_orientation(int orientation)
       preview_thumbnail_w = thumbnail_h;
       break;
     }
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(FALSE);
 }
 
 static void
@@ -2873,7 +2897,7 @@ do_color_updates (void)
 	    }
 	}
     }
-  update_adjusted_thumbnail ();
+  update_adjusted_thumbnail (TRUE);
 }
 
 static void
@@ -2902,6 +2926,40 @@ update_standard_print_command(void)
 }
 
 static void
+set_color_options(void)
+{
+  stp_parameter_t desc;
+  stp_describe_parameter(pv->v, "PrintingMode", &desc);
+  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
+    {
+      if (!stp_string_list_is_present(desc.bounds.str, "Color"))
+	{
+	  gtk_widget_set_sensitive (output_types[1].button, TRUE);
+	  if (gtk_toggle_button_get_active
+	      (GTK_TOGGLE_BUTTON (output_types[0].button)) == TRUE)
+	    gtk_toggle_button_set_active
+	      (GTK_TOGGLE_BUTTON (output_types[1].button), TRUE);
+	  gtk_widget_set_sensitive (output_types[0].button, FALSE);
+	}
+      else if (!stp_string_list_is_present(desc.bounds.str, "BW"))
+	{
+	  gtk_widget_set_sensitive (output_types[0].button, TRUE);
+	  if (gtk_toggle_button_get_active
+	      (GTK_TOGGLE_BUTTON (output_types[1].button)) == TRUE)
+	    gtk_toggle_button_set_active
+	      (GTK_TOGGLE_BUTTON (output_types[0].button), TRUE);
+	  gtk_widget_set_sensitive (output_types[1].button, FALSE);
+	}
+      else
+	{
+	  gtk_widget_set_sensitive (output_types[0].button, TRUE);
+	  gtk_widget_set_sensitive (output_types[1].button, TRUE);
+	}
+    }
+  stp_parameter_description_destroy(&desc);
+}
+
+static void
 do_all_updates(void)
 {
   gint i;
@@ -2938,6 +2996,7 @@ do_all_updates(void)
       g_signal_emit_by_name (G_OBJECT(scaling_adjustment), "value_changed");
     }
 
+  set_color_options();
   for (i = 0; i < output_type_count; i++)
     {
       if (stp_get_string_parameter(pv->v, "PrintingMode") &&
@@ -3061,7 +3120,6 @@ plist_callback (GtkWidget *widget,
 {
   gint         i;
   char *tmp;
-  stp_parameter_t desc;
 
   suppress_preview_update++;
   invalidate_frame ();
@@ -3095,34 +3153,6 @@ plist_callback (GtkWidget *widget,
   if (strcmp(stp_get_driver(pv->v), "") != 0)
     tmp_printer = stp_get_printer(pv->v);
 
-  stp_describe_parameter(pv->v, "PrintingMode", &desc);
-  if (desc.p_type == STP_PARAMETER_TYPE_STRING_LIST)
-    {
-      if (!stp_string_list_is_present(desc.bounds.str, "Color"))
-	{
-	  gtk_widget_set_sensitive (output_types[1].button, TRUE);
-	  if (gtk_toggle_button_get_active
-	      (GTK_TOGGLE_BUTTON (output_types[0].button)) == TRUE)
-	    gtk_toggle_button_set_active
-	      (GTK_TOGGLE_BUTTON (output_types[1].button), TRUE);
-	  gtk_widget_set_sensitive (output_types[0].button, FALSE);
-	}
-      else if (!stp_string_list_is_present(desc.bounds.str, "BW"))
-	{
-	  gtk_widget_set_sensitive (output_types[0].button, TRUE);
-	  if (gtk_toggle_button_get_active
-	      (GTK_TOGGLE_BUTTON (output_types[1].button)) == TRUE)
-	    gtk_toggle_button_set_active
-	      (GTK_TOGGLE_BUTTON (output_types[0].button), TRUE);
-	  gtk_widget_set_sensitive (output_types[1].button, FALSE);
-	}
-      else
-	{
-	  gtk_widget_set_sensitive (output_types[0].button, TRUE);
-	  gtk_widget_set_sensitive (output_types[1].button, TRUE);
-	}
-    }
-  stp_parameter_description_destroy(&desc);
   gtk_entry_set_text(GTK_ENTRY(file_entry),
 		     stpui_plist_get_output_filename(pv));
   tmp = stpui_build_standard_print_command(pv, stp_get_printer(pv->v));
@@ -3137,7 +3167,7 @@ plist_callback (GtkWidget *widget,
   setup_update ();
   do_all_updates();
   suppress_preview_update--;
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
   preview_update ();
 }
 
@@ -3337,7 +3367,7 @@ combo_callback(GtkWidget *widget, gpointer data)
 	    set_media_size(new_value);
 	  g_idle_add(refresh_all_options, NULL);
 	  if (option->fast_desc->p_class == STP_PARAMETER_CLASS_OUTPUT)
-	    update_adjusted_thumbnail();
+	    update_adjusted_thumbnail(TRUE);
 	  preview_update();
 	}
     }
@@ -3356,6 +3386,7 @@ orientation_callback (GtkWidget *widget,
     {
       invalidate_preview_thumbnail ();
       set_orientation((gint) data);
+      update_adjusted_thumbnail(TRUE);
       preview_update ();
     }
 }
@@ -3377,7 +3408,7 @@ output_type_callback (GtkWidget *widget,
 	gtk_widget_show(output_color_vbox);
       stp_set_string_parameter(pv->v, "PrintingMode", (const char *) data);
       invalidate_preview_thumbnail ();
-      update_adjusted_thumbnail ();
+      update_adjusted_thumbnail (TRUE);
       set_options_active(NULL);
       preview_update ();
       do_all_updates();
@@ -3889,18 +3920,77 @@ fill_buffer_writefunc(void *priv, const char *buffer, size_t bytes)
 {
   int mask = 0;
   int i;
-  int pixels = bytes / 4;
+
   priv_t *p = (priv_t *) priv;
   unsigned char *where = p->base_addr + p->offset;
   const unsigned char *xbuffer = (const unsigned char *)buffer;
 
-  if (p->bpp == 1)
+  if (strcmp(p->output_type, "Whitescale") == 0)
+    {
+      memcpy(where, xbuffer, bytes);
+      p->offset += bytes;
+    }
+  else if (strcmp(p->output_type, "Grayscale") == 0)
     {
-      memcpy(where, buffer, bytes);
+      for (i = 0; i < bytes; i++)
+	where[i] = ~xbuffer[i];
       p->offset += bytes;
     }
+  else if (strcmp(p->output_type, "RGB") == 0)
+    {
+      int pixels = bytes / 3;
+      if (bytes + p->offset > p->limit)
+	bytes = p->limit - p->offset;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(red_button)))
+	mask |= 1;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(green_button)))
+	mask |= 2;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(blue_button)))
+	mask |= 4;
+
+      memset(where, 0, pixels * 3);
+      for (i = 0; i < pixels; i++)
+	{
+	  if (mask & 1)
+	    where[0] = xbuffer[0];
+	  if (mask & 2)
+	    where[1] = xbuffer[1];
+	  if (mask & 4)
+	    where[2] = xbuffer[2];
+	  where += 3;
+	  xbuffer += 3;
+	}
+      p->offset += pixels * 3;
+    }
+  else if (strcmp(p->output_type, "CMY") == 0)
+    {
+      int pixels = bytes / 3;
+      if (bytes + p->offset > p->limit)
+	bytes = p->limit - p->offset;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cyan_button)))
+	mask |= 1;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(magenta_button)))
+	mask |= 2;
+      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(yellow_button)))
+	mask |= 4;
+
+      memset(where, 0xff, pixels * 3);
+      for (i = 0; i < pixels; i++)
+	{
+	  if (mask & 1)
+	    where[0] = -xbuffer[0];
+	  if (mask & 2)
+	    where[1] = -xbuffer[1];
+	  if (mask & 4)
+	    where[2] = -xbuffer[2];
+	  where += 3;
+	  xbuffer += 3;
+	}
+      p->offset += pixels * 3;
+    }
   else
     {
+      int pixels = bytes / 4;
       if (bytes + p->offset > p->limit)
 	bytes = p->limit - p->offset;
       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cyan_button)))
@@ -4077,7 +4167,7 @@ compute_thumbnail(const stp_vars_t *v)
   stp_image_t *im = stpui_image_thumbnail_new(thumbnail_data, thumbnail_w,
 					      thumbnail_h, thumbnail_bpp);
   stp_vars_t *nv = stp_vars_create_copy(v);
-  stp_set_driver(nv, "raw-data-8");
+  const char *output_type = stp_describe_output(nv);
   stp_set_top(nv, 0);
   stp_set_left(nv, 0);
   stp_set_width(nv, thumbnail_w);
@@ -4086,18 +4176,65 @@ compute_thumbnail(const stp_vars_t *v)
   stp_set_outdata(nv, &priv);
   stp_set_errfunc(nv, stpui_get_errfunc());
   stp_set_errdata(nv, stpui_get_errdata());
-  if (!print_mode_is_color(nv))
+  if (strcmp(output_type, "Whitescale") == 0)
     {
+      gtk_widget_hide(output_color_vbox);
       priv.bpp = 1;
+      priv.output_type = "Whitescale";
       stp_set_string_parameter(nv, "InkType", "RGBGray");
     }
+  else if (strcmp(output_type, "Grayscale") == 0)
+    {
+      gtk_widget_hide(output_color_vbox);
+      priv.bpp = 1;
+      priv.output_type = "Grayscale";
+      stp_set_string_parameter(nv, "InkType", "CMYGray");
+    }
+  else if (strcmp(output_type, "CMY") == 0)
+    {
+      gtk_widget_hide(black_button);
+      gtk_widget_hide(red_button);
+      gtk_widget_hide(green_button);
+      gtk_widget_hide(blue_button);
+      gtk_widget_show(cyan_button);
+      gtk_widget_show(magenta_button);
+      gtk_widget_show(yellow_button);
+      gtk_widget_show(output_color_vbox);
+      priv.bpp = 3;
+      priv.output_type = "CMY";
+      stp_set_string_parameter(nv, "InkType", "CMY");
+    }
+  else if (strcmp(output_type, "RGB") == 0)
+    {
+      gtk_widget_hide(cyan_button);
+      gtk_widget_hide(magenta_button);
+      gtk_widget_hide(yellow_button);
+      gtk_widget_hide(black_button);
+      gtk_widget_show(red_button);
+      gtk_widget_show(green_button);
+      gtk_widget_show(blue_button);
+      gtk_widget_show(output_color_vbox);
+      priv.bpp = 3;
+      priv.output_type = "RGB";
+      stp_set_string_parameter(nv, "InkType", "RGB");
+    }
   else
     {
+      gtk_widget_hide(red_button);
+      gtk_widget_hide(green_button);
+      gtk_widget_hide(blue_button);
+      gtk_widget_show(cyan_button);
+      gtk_widget_show(magenta_button);
+      gtk_widget_show(yellow_button);
+      gtk_widget_show(black_button);
+      gtk_widget_show(output_color_vbox);
       priv.bpp = 4;
+      priv.output_type = "CMYK";
       stp_set_string_parameter(nv, "InkType", "CMYK");
     }
   stp_set_page_height(nv, thumbnail_h);
   stp_set_page_width(nv, thumbnail_w);
+  stp_set_driver(nv, "raw-data-8");
   stp_set_float_parameter(nv, "Density", 1.0);
   stp_set_float_parameter(nv, "InkLimit", 0);
   stp_set_string_parameter(nv, "InputImageType", "RGB");
@@ -4112,6 +4249,7 @@ compute_thumbnail(const stp_vars_t *v)
       fprintf(stderr, "Could not print thumbnail!\n");
     }
   stp_vars_destroy(nv);
+  thumbnail_needs_rebuild = FALSE;
   return answer;
 }
 
@@ -4156,21 +4294,6 @@ set_thumbnail_orientation(void)
 }
 
 static void
-update_adjusted_thumbnail (void)
-{
-  if (thumbnail_data && adjusted_thumbnail_data && do_update_thumbnail &&
-      suppress_preview_update == 0)
-    {
-      if (compute_thumbnail(pv->v))
-	{
-	  set_thumbnail_orientation();
-	  redraw_color_swatch ();
-	  preview_update ();
-	}
-    }
-}
-
-static void
 draw_arrow (GdkWindow *w,
             GdkGC     *gc,
             gint       paper_left,
@@ -4453,13 +4576,30 @@ do_preview_thumbnail (void)
 static gboolean
 idle_preview_thumbnail(gpointer data)
 {
-  set_orientation(pv->orientation);
-  do_preview_thumbnail();
+  if (thumbnail_data && adjusted_thumbnail_data && do_update_thumbnail)
+    {
+      thumbnail_update_pending = TRUE;
+      set_orientation(pv->orientation);
+      if (thumbnail_needs_rebuild && compute_thumbnail(pv->v))
+	{
+	  set_thumbnail_orientation();
+	  redraw_color_swatch ();
+	}
+      do_preview_thumbnail();
+    }
   thumbnail_update_pending = FALSE;
   return FALSE;
 }
 
 static void
+update_adjusted_thumbnail (gboolean regenerate_image)
+{
+  if (regenerate_image)
+    thumbnail_needs_rebuild = TRUE;
+  preview_update ();
+}
+
+static void
 preview_expose (void)
 {
   need_exposure = TRUE;
@@ -4732,7 +4872,7 @@ color_update (GtkAdjustment *adjustment)
 	    {
 	      stp_set_float_parameter(pv->v, opt->fast_desc->name,
 				      adjustment->value);
-	      update_adjusted_thumbnail();
+	      update_adjusted_thumbnail(TRUE);
 	    }
 	}
     }
@@ -4757,7 +4897,7 @@ dimension_update (GtkAdjustment *adjustment)
 	    {
 	      stp_set_dimension_parameter(pv->v, opt->fast_desc->name,
 					  adjustment->value * unit_scaler);
-	      update_adjusted_thumbnail();
+	      update_adjusted_thumbnail(FALSE);
 	    }
 	}
     }
@@ -4877,7 +5017,7 @@ set_controls_active (GtkObject *checkbutton, gpointer xopt)
 	}
     }
   invalidate_preview_thumbnail();
-  update_adjusted_thumbnail();
+  update_adjusted_thumbnail(TRUE);
 }
 
 static void
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index f895580..05a13ee 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: plist.c,v 1.5 2005/06/14 02:47:13 rlk Exp $"
+ * "$Id: plist.c,v 1.6 2005/10/26 01:28:35 rlk Exp $"
  *
  *   Print plug-in for the GIMP.
  *
@@ -311,6 +311,19 @@ stpui_set_image_channel_depth(gint depth)
   image_channel_depth = depth;
 }
 
+static void
+writefunc(void *file, const char *buf, size_t bytes)
+{
+  FILE *prn = (FILE *)file;
+  fwrite(buf, 1, bytes, prn);
+}
+
+static void
+stpui_errfunc(void *file, const char *buf, size_t bytes)
+{
+  g_message(buf);
+}
+
 void
 stpui_printer_initialize(stpui_plist_t *printer)
 {
@@ -327,6 +340,8 @@ stpui_printer_initialize(stpui_plist_t *printer)
   printer->auto_size_roll_feed_paper = 0;
   printer->unit = 0;
   printer->v = stp_vars_create();
+  stp_set_errfunc(printer->v, writefunc);
+  stp_set_errdata(printer->v, stderr);
   stpui_plist_set_copy_count(printer, 1);
   stp_set_string_parameter(printer->v, "InputImageType", image_type);
   if (image_raw_channels)
@@ -917,7 +932,9 @@ stpui_printrc_load_v2(FILE *fp)
   yyin = fp;
 
   stpui_printrc_current_printer = NULL;
+  setlocale(LC_ALL, "C");
   retval = yyparse();
+  setlocale(LC_ALL, "");
   if (stpui_printrc_current_printer)
     {
       int i;
@@ -1228,19 +1245,6 @@ usr1_handler (int sig)
   usr1_interrupt = 1;
 }
 
-static void
-writefunc(void *file, const char *buf, size_t bytes)
-{
-  FILE *prn = (FILE *)file;
-  fwrite(buf, 1, bytes, prn);
-}
-
-static void
-stpui_errfunc(void *file, const char *buf, size_t bytes)
-{
-  g_message(buf);
-}
-
 /*
  *
  * Process control for actually printing.  Documented 20040821
@@ -1747,5 +1751,5 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 }
 
 /*
- * End of "$Id: plist.c,v 1.5 2005/06/14 02:47:13 rlk Exp $".
+ * End of "$Id: plist.c,v 1.6 2005/10/26 01:28:35 rlk Exp $".
  */
diff --git a/src/gutenprintui2/printrcl.c b/src/gutenprintui2/printrcl.c
index 1c4d8e1..5cf2726 100644
--- a/src/gutenprintui2/printrcl.c
+++ b/src/gutenprintui2/printrcl.c
@@ -1,32 +1,85 @@
-/* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- */
+#line 3 "printrcl.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
 
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
 #endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -34,34 +87,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -76,71 +112,71 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE yyrestart(yyin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
+#endif
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
 extern int yyleng;
+
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -177,12 +213,16 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -196,23 +236,33 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
 int yyleng;
 
 /* Points to current character in buffer. */
@@ -225,69 +275,93 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define yywrap() 1
+#define yywrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
+
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
 typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 40
 #define YY_END_OF_BUFFER 41
-static yyconst short int yy_accept[335] =
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[335] =
     {   0,
         0,    0,   41,   40,   37,   39,   40,   38,   40,   40,
        31,   35,   35,   35,   35,   35,   35,   35,   35,   35,
@@ -328,7 +402,7 @@ static yyconst short int yy_accept[335] =
         0,    2,   18,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -360,7 +434,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[39] =
+static yyconst flex_int32_t yy_meta[39] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
@@ -368,7 +442,7 @@ static yyconst int yy_meta[39] =
         3,    3,    3,    3,    3,    3,    3,    3
     } ;
 
-static yyconst short int yy_base[340] =
+static yyconst flex_int16_t yy_base[340] =
     {   0,
         0,    0,  374,  375,  371,  375,  368,  343,  364,   29,
        32,  336,  341,   18,   26,   21,   32,  343,    0,  340,
@@ -409,7 +483,7 @@ static yyconst short int yy_base[340] =
        81,  375,  375,  375,   94,   97,  100,   89,  103
     } ;
 
-static yyconst short int yy_def[340] =
+static yyconst flex_int16_t yy_def[340] =
     {   0,
       334,    1,  334,  334,  334,  334,  335,  336,  337,  334,
       334,  338,  338,  338,  338,  338,  338,  338,  338,  338,
@@ -450,7 +524,7 @@ static yyconst short int yy_def[340] =
       334,  334,  334,    0,  334,  334,  334,  334,  334
     } ;
 
-static yyconst short int yy_nxt[414] =
+static yyconst flex_int16_t yy_nxt[414] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        11,    4,    4,   12,   13,   14,   15,   16,   17,   18,
@@ -500,7 +574,7 @@ static yyconst short int yy_nxt[414] =
       334,  334,  334
     } ;
 
-static yyconst short int yy_chk[414] =
+static yyconst flex_int16_t yy_chk[414] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -553,6 +627,9 @@ static yyconst short int yy_chk[414] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -562,7 +639,6 @@ static char *yy_last_accepting_cpos;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "printrcl.l"
-#define INITIAL 0
 /*		-*-Mode: C-*-
  * "$Id: printrcl.l,v 1.1 2004/09/17 18:38:14 rleigh Exp $"
  *
@@ -621,7 +697,21 @@ q_strdup(const char *s)
     return g_strndup(s + 1, strlen(s) - 2);
 }
 
-#line 625 "printrcl.c"
+#line 701 "printrcl.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -629,65 +719,30 @@ q_strdup(const char *s)
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
+extern int yywrap (void );
 #endif
 #endif
 
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+    static void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
+
 #ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
+static int yyinput (void );
 #else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
+static int input (void );
 #endif
 
-#else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
-#endif
-
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -696,7 +751,6 @@ YY_MALLOC_DECL
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -709,9 +763,10 @@ YY_MALLOC_DECL
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -721,9 +776,22 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -744,12 +812,18 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -766,27 +840,29 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
+    
 #line 73 "printrcl.l"
 
 
-#line 779 "printrcl.c"
+#line 855 "printrcl.c"
 
-	if ( yy_init )
+	if ( (yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 0;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -794,34 +870,36 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		yy_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -838,24 +916,22 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			goto yy_find_action;
 
 case 1:
@@ -1019,6 +1095,7 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 33:
+/* rule 33 can match eol */
 YY_RULE_SETUP
 #line 109 "printrcl.l"
 yylval.sval = q_strdup(yytext); DBG(tSTRING); return tSTRING;
@@ -1034,6 +1111,7 @@ YY_RULE_SETUP
 yylval.sval = g_strdup(yytext); DBG(tWORD); return tWORD;
 	YY_BREAK
 case 36:
+/* rule 36 can match eol */
 YY_RULE_SETUP
 #line 112 "printrcl.l"
 DBG(PRINTRC_HDR); return PRINTRC_HDR;
@@ -1049,6 +1127,7 @@ YY_RULE_SETUP
 DBG(comment1); 	/* Skip comments */
 	YY_BREAK
 case 39:
+/* rule 39 can match eol */
 YY_RULE_SETUP
 #line 115 "printrcl.l"
 DBG(newline); mylineno++;
@@ -1058,33 +1137,33 @@ YY_RULE_SETUP
 #line 116 "printrcl.l"
 ECHO;
 	YY_BREAK
-#line 1062 "printrcl.c"
+#line 1141 "printrcl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1094,13 +1173,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1113,30 +1192,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_c_buf_p);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1147,7 +1226,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1155,30 +1234,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1189,8 +1268,7 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1199,21 +1277,20 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1233,34 +1310,30 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1273,8 +1346,7 @@ static int yy_get_next_buffer()
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1284,35 +1356,35 @@ static int yy_get_next_buffer()
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			yyrestart(yyin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1320,32 +1392,31 @@ static int yy_get_next_buffer()
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1357,30 +1428,23 @@ static yy_state_type yy_get_previous_state()
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1392,80 +1456,73 @@ yy_state_type yy_current_state;
 	yy_is_jam = (yy_current_state == 334);
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
-
+}
 
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1479,16 +1536,16 @@ static int input()
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					yyrestart(yyin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( yywrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1498,90 +1555,92 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1590,80 +1649,75 @@ int size;
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	yy_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
+		yyfree((void *) b->yy_ch_buf  );
 
+	yyfree((void *) b  );
+}
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1680,29 +1734,121 @@ YY_BUFFER_STATE b;
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
 
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1716,47 +1862,43 @@ yy_size_t size;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	yy_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * @param yy_str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
+{
+    
+	return yy_scan_bytes(yy_str,strlen(yy_str) );
+}
 
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1765,7 +1907,7 @@ int len;
 
 	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = yy_scan_buffer(buf,n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1775,148 +1917,164 @@ int len;
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
+}
 
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
 #endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Redefine yyless() so it works in section 3 code. */
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/* Accessor  methods (get/set functions) to struct members. */
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
 
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+/** Get the current token.
+ * 
+ */
 
+char *yyget_text  (void)
+{
+        return yytext;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
 
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
 
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
 
-/* Redefine yyless() so it works in section 3 code. */
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
 
+    return 0;
+}
 
-/* Internal utility routines. */
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
-	for ( i = 0; i < n; ++i )
+    	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
-	for ( n = 0; s[n]; ++n )
+    	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *yyalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1925,23 +2083,25 @@ yy_size_t size;
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
 #endif
 #line 116 "printrcl.l"
diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c
index 0c96062..c1f0cbe 100644
--- a/src/gutenprintui2/printrcy.c
+++ b/src/gutenprintui2/printrcy.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    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
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -36,6 +36,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.1"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -93,6 +96,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
@@ -183,6 +187,11 @@ static stpui_plist_t *current_printer = NULL;
 # define YYERROR_VERBOSE 0
 #endif
 
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -195,22 +204,48 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 199 "printrcy.c"
+/* Line 219 of yacc.c.  */
+#line 209 "printrcy.c"
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if defined (__STDC__) || defined (__cplusplus)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     define YYINCLUDED_STDLIB_H
 #    endif
 #   endif
 #  endif
@@ -219,25 +254,51 @@ typedef int YYSTYPE;
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  short int yyss;
   YYSTYPE yyvs;
   };
 
@@ -247,20 +308,20 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined (__GNUC__) && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -289,7 +350,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short yysigned_char;
+   typedef short int yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -310,7 +371,7 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   295
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
@@ -389,7 +450,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const unsigned short int yyrline[] =
 {
        0,   100,   100,   111,   118,   128,   138,   148,   158,   164,
      168,   172,   176,   180,   184,   188,   206,   210,   214,   217,
@@ -402,37 +463,37 @@ static const unsigned short yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION", 
-  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER", 
-  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING", 
-  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP", 
-  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR", 
-  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS", 
-  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL", 
-  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE", 
-  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination", 
-  "Queue_Name", "Output_Filename", "Extra_Printer_Options", 
-  "Custom_Command", "Command_Type", "Scaling", "Orientation", 
-  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type", 
-  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param", 
-  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param", 
-  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", 
-  "Parameters", "Standard_Value", "Standard_Values", "A_Printer", 
-  "Printers", "Current_Printer", "Show_All_Paper_Sizes", "Global", 
-  "Old_Globals", "New_Global_Setting", "Global_Setting", 
-  "Global_Settings", "Global_Subblock", "Global_Block", "Thing", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tDIMENSION",
+  "tBOOLEAN", "tSTRING", "tWORD", "tGSWORD", "CURRENT_PRINTER",
+  "SHOW_ALL_PAPER_SIZES", "PRINTER", "DESTINATION", "SCALING",
+  "ORIENTATION", "AUTOSIZE_ROLL_PAPER", "UNIT", "DRIVER", "LEFT", "TOP",
+  "CUSTOM_PAGE_WIDTH", "CUSTOM_PAGE_HEIGHT", "OUTPUT_TYPE", "PRINTRC_HDR",
+  "PARAMETER", "QUEUE_NAME", "OUTPUT_FILENAME", "EXTRA_PRINTER_OPTIONS",
+  "CUSTOM_COMMAND", "COMMAND_TYPE", "GLOBAL_SETTINGS", "GLOBAL",
+  "END_GLOBAL_SETTINGS", "pINT", "pSTRING_LIST", "pFILE", "pDOUBLE",
+  "pDIMENSION", "pBOOLEAN", "pCURVE", "$accept", "Printer", "Destination",
+  "Queue_Name", "Output_Filename", "Extra_Printer_Options",
+  "Custom_Command", "Command_Type", "Scaling", "Orientation",
+  "Autosize_Roll_Paper", "Unit", "Left", "Top", "Output_Type",
+  "Custom_Page_Width", "Custom_Page_Height", "Empty", "Int_Param",
+  "String_List_Param", "File_Param", "Double_Param", "Dimension_Param",
+  "Boolean_Param", "Curve_Param", "Typed_Param", "Parameter", "Parameters",
+  "Standard_Value", "Standard_Values", "A_Printer", "Printers",
+  "Current_Printer", "Show_All_Paper_Sizes", "Global", "Old_Globals",
+  "New_Global_Setting", "Global_Setting", "Global_Settings",
+  "Global_Subblock", "Global_Block", "Thing", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -573,22 +634,6 @@ static const unsigned char yystos[] =
        4,     3,     6,     7
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -596,7 +641,8 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
+
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -617,26 +663,59 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (N)								\
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (0)
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+              (Loc).first_line, (Loc).first_column,	\
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -659,36 +738,30 @@ do {						\
     YYFPRINTF Args;				\
 } while (0)
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
 do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
+      yysymprint (stderr,					\
+                  Type, Value);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    short int *bottom;
+    short int *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -718,13 +791,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
+             yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
@@ -738,8 +811,7 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -754,13 +826,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -782,7 +850,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  register const char *yys = yystr;
+  const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -807,8 +875,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -818,7 +886,55 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+#endif /* YYERROR_VERBOSE */
 
 
 
@@ -842,15 +958,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
   switch (yytype)
     {
       default:
@@ -866,10 +982,11 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -877,6 +994,10 @@ yydestruct (yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
   switch (yytype)
     {
 
@@ -904,10 +1025,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -933,17 +1054,17 @@ yyparse (void)
 #else
 int
 yyparse ()
-
+    ;
 #endif
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -955,14 +1076,14 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  short int *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
@@ -1019,14 +1140,14 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1037,21 +1158,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1083,18 +1204,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1109,7 +1230,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1129,8 +1250,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1182,27 +1303,27 @@ yyreduce:
         case 2:
 #line 101 "printrcy.y"
     {
-	  current_printer = stpui_plist_create(yyvsp[-1].sval, yyvsp[0].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  current_printer = stpui_plist_create((yyvsp[-1].sval), (yyvsp[0].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 3:
 #line 112 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
-	    g_free(yyvsp[0].sval);
+	  if ((yyvsp[0].sval))
+	    g_free((yyvsp[0].sval));
 	}
     break;
 
   case 4:
 #line 119 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_queue_name(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_queue_name(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1210,10 +1331,10 @@ yyreduce:
   case 5:
 #line 129 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_output_filename(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_output_filename(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1221,10 +1342,10 @@ yyreduce:
   case 6:
 #line 139 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_extra_printer_options(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_extra_printer_options(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1232,10 +1353,10 @@ yyreduce:
   case 7:
 #line 149 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_plist_set_custom_command(current_printer, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_plist_set_custom_command(current_printer, (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
 	}
     break;
@@ -1243,44 +1364,44 @@ yyreduce:
   case 8:
 #line 159 "printrcy.y"
     {
-	  stpui_plist_set_command_type(current_printer, yyvsp[0].ival);
+	  stpui_plist_set_command_type(current_printer, (yyvsp[0].ival));
 	}
     break;
 
   case 9:
 #line 165 "printrcy.y"
-    { current_printer->scaling = yyvsp[0].dval; }
+    { current_printer->scaling = (yyvsp[0].dval); }
     break;
 
   case 10:
 #line 169 "printrcy.y"
-    { current_printer->orientation = yyvsp[0].ival; }
+    { current_printer->orientation = (yyvsp[0].ival); }
     break;
 
   case 11:
 #line 173 "printrcy.y"
-    { current_printer->auto_size_roll_feed_paper = yyvsp[0].ival; }
+    { current_printer->auto_size_roll_feed_paper = (yyvsp[0].ival); }
     break;
 
   case 12:
 #line 177 "printrcy.y"
-    { current_printer->unit = yyvsp[0].ival; }
+    { current_printer->unit = (yyvsp[0].ival); }
     break;
 
   case 13:
 #line 181 "printrcy.y"
-    { stp_set_left(current_printer->v, yyvsp[0].ival); }
+    { stp_set_left(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 14:
 #line 185 "printrcy.y"
-    { stp_set_top(current_printer->v, yyvsp[0].ival); }
+    { stp_set_top(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 15:
 #line 189 "printrcy.y"
     {
-	  switch (yyvsp[0].ival)
+	  switch ((yyvsp[0].ival))
 	    {
 	    case 0:
 	      stp_set_string_parameter
@@ -1298,164 +1419,165 @@ yyreduce:
 
   case 16:
 #line 207 "printrcy.y"
-    { stp_set_page_width(current_printer->v, yyvsp[0].ival); }
+    { stp_set_page_width(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 17:
 #line 211 "printrcy.y"
-    { stp_set_page_height(current_printer->v, yyvsp[0].ival); }
+    { stp_set_page_height(current_printer->v, (yyvsp[0].ival)); }
     break;
 
   case 19:
 #line 218 "printrcy.y"
     {
-	  stp_set_int_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_int_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					 STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_int_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_int_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					 STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
   case 20:
 #line 232 "printrcy.y"
     {
-	  stp_set_string_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_string_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					    STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_string_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_string_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					    STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 21:
 #line 247 "printrcy.y"
     {
-	  stp_set_file_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].sval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_file_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].sval));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					  STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_file_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_file_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					  STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 22:
 #line 262 "printrcy.y"
     {
-	  stp_set_float_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].dval);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_float_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].dval));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					   STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_float_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_float_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					   STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
   case 23:
 #line 276 "printrcy.y"
     {
-	  stp_set_dimension_parameter(current_printer->v, yyvsp[-3].sval, yyvsp[0].ival);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
+	  stp_set_dimension_parameter(current_printer->v, (yyvsp[-3].sval), (yyvsp[0].ival));
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_dimension_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_dimension_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
   case 24:
 #line 290 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "False") == 0)
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 0);
+	  if (strcmp((yyvsp[0].sval), "False") == 0)
+	    stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 0);
 	  else
-	    stp_set_boolean_parameter(current_printer->v, yyvsp[-3].sval, 1);
-	  if (strcmp(yyvsp[-1].sval, "False") == 0)
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_boolean_parameter(current_printer->v, (yyvsp[-3].sval), 1);
+	  if (strcmp((yyvsp[-1].sval), "False") == 0)
+	    stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					     STP_PARAMETER_INACTIVE);
 	  else
-	    stp_set_boolean_parameter_active(current_printer->v, yyvsp[-3].sval,
+	    stp_set_boolean_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					     STP_PARAMETER_ACTIVE);
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 25:
 #line 308 "printrcy.y"
     {
-	  stp_curve_t *curve = stp_curve_create_from_string(yyvsp[0].sval);
+	  stp_curve_t *curve = stp_curve_create_from_string((yyvsp[0].sval));
 	  if (curve)
 	    {
-	      stp_set_curve_parameter(current_printer->v, yyvsp[-3].sval, curve);
-	      if (strcmp(yyvsp[-1].sval, "False") == 0)
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
+	      stp_set_curve_parameter(current_printer->v, (yyvsp[-3].sval), curve);
+	      if (strcmp((yyvsp[-1].sval), "False") == 0)
+		stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_INACTIVE);
 	      else
-		stp_set_curve_parameter_active(current_printer->v, yyvsp[-3].sval,
+		stp_set_curve_parameter_active(current_printer->v, (yyvsp[-3].sval),
 					       STP_PARAMETER_ACTIVE);
 	      stp_curve_destroy(curve);
 	    }
-	  g_free(yyvsp[-3].sval);
-	  g_free(yyvsp[-1].sval);
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[-3].sval));
+	  g_free((yyvsp[-1].sval));
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 56:
 #line 353 "printrcy.y"
-    { stpui_printrc_current_printer = yyvsp[0].sval; }
+    { stpui_printrc_current_printer = (yyvsp[0].sval); }
     break;
 
   case 57:
 #line 357 "printrcy.y"
     {
-	  if (strcmp(yyvsp[0].sval, "True") == 0)
+	  if (strcmp((yyvsp[0].sval), "True") == 0)
 	    stpui_show_all_paper_sizes = 1;
 	  else
 	    stpui_show_all_paper_sizes = 0;
-	  g_free(yyvsp[0].sval);
+	  g_free((yyvsp[0].sval));
 	}
     break;
 
   case 61:
 #line 373 "printrcy.y"
     {
-	  if (yyvsp[0].sval)
+	  if ((yyvsp[0].sval))
 	    {
-	      stpui_set_global_parameter(yyvsp[-1].sval, yyvsp[0].sval);
-	      g_free(yyvsp[0].sval);
+	      stpui_set_global_parameter((yyvsp[-1].sval), (yyvsp[0].sval));
+	      g_free((yyvsp[0].sval));
 	    }
-	  g_free(yyvsp[-1].sval);
+	  g_free((yyvsp[-1].sval));
 	}
     break;
 
 
+      default: break;
     }
 
-/* Line 991 of yacc.c.  */
-#line 1458 "printrcy.c"
+/* Line 1126 of yacc.c.  */
+#line 1581 "printrcy.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1494,104 +1616,153 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
+	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+	  YYSIZE_T yysize = yysize0;
+	  YYSIZE_T yysize1;
+	  int yysize_overflow = 0;
+	  char *yymsg = 0;
+#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+	  int yyx;
+
+#if 0
+	  /* This is so xgettext sees the translatable formats that are
+	     constructed on the fly.  */
+	  YY_("syntax error, unexpected %s");
+	  YY_("syntax error, unexpected %s, expecting %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+	  char *yyfmt;
+	  char const *yyf;
+	  static char const yyunexpected[] = "syntax error, unexpected %s";
+	  static char const yyexpecting[] = ", expecting %s";
+	  static char const yyor[] = " or %s";
+	  char yyformat[sizeof yyunexpected
+			+ sizeof yyexpecting - 1
+			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+			   * (sizeof yyor - 1))];
+	  char const *yyprefix = yyexpecting;
 
-	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 1;
+
+	  yyarg[0] = yytname[yytype];
+	  yyfmt = yystpcpy (yyformat, yyunexpected);
+
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
+	      {
+		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+		  {
+		    yycount = 1;
+		    yysize = yysize0;
+		    yyformat[sizeof yyunexpected - 1] = '\0';
+		    break;
+		  }
+		yyarg[yycount++] = yytname[yyx];
+		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+		yysize_overflow |= yysize1 < yysize;
+		yysize = yysize1;
+		yyfmt = yystpcpy (yyfmt, yyprefix);
+		yyprefix = yyor;
+	      }
+
+	  yyf = YY_(yyformat);
+	  yysize1 = yysize + yystrlen (yyf);
+	  yysize_overflow |= yysize1 < yysize;
+	  yysize = yysize1;
+
+	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+	    yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg)
 	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
+	      /* Avoid sprintf, as that infringes on the user's name space.
+		 Don't have undefined behavior even if the translation
+		 produced a string with the wrong number of "%s"s.  */
+	      char *yyp = yymsg;
+	      int yyi = 0;
+	      while ((*yyp = *yyf))
 		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
+		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		    {
+		      yyp += yytnamerr (yyp, yyarg[yyi++]);
+		      yyf += 2;
+		    }
+		  else
+		    {
+		      yyp++;
+		      yyf++;
+		    }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
+	    {
+	      yyerror (YY_("syntax error"));
+	      goto yyexhaustedlab;
+	    }
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	yyerror (YY_("syntax error"));
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
+      if (yychar <= YYEOF)
         {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
         }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      else
+	{
+	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
-  goto yyerrlab2;
+  goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-
-  /* Suppress GCC warning that yyerrlab1 is unused when no action
-     invokes YYERROR.  */
-#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
-    && !defined __cplusplus
-  __attribute__ ((__unused__))
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (0)
+     goto yyerrorlab;
 
-  goto yyerrlab2;
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrlab2 -- pop states until the error token can be shifted.  |
-`---------------------------------------------------------------*/
-yyerrlab2:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1612,22 +1783,22 @@ yyerrlab2:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1647,16 +1818,25 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK;
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
diff --git a/src/gutenprintui2/printrcy.h b/src/gutenprintui2/printrcy.h
index afa662b..a1ebec0 100644
--- a/src/gutenprintui2/printrcy.h
+++ b/src/gutenprintui2/printrcy.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    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
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -69,6 +69,7 @@
      pCURVE = 295
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tDIMENSION 260
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 3377183..aa19a62 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.91 2005/06/26 10:56:51 rleigh Exp $
+## $Id: Makefile.am,v 1.92 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index 1bd64de..7fe8e15 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,8 +17,6 @@
 # Variables
 
 
-SOURCES = $(color_traditional_la_SOURCES) $(libgutenprint_la_SOURCES) $(print_canon_la_SOURCES) $(print_escp2_la_SOURCES) $(print_lexmark_la_SOURCES) $(print_olympus_la_SOURCES) $(print_pcl_la_SOURCES) $(print_ps_la_SOURCES) $(print_raw_la_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -146,8 +144,8 @@ am_print_raw_la_OBJECTS = print-raw.lo
 print_raw_la_OBJECTS = $(am_print_raw_la_OBJECTS)
 @BUILD_MODULES_TRUE@am_print_raw_la_rpath = -rpath $(pkgmoduledir)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -174,8 +172,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -213,7 +209,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -226,14 +221,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -368,13 +361,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -420,8 +408,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 pkgconfigdatadir = $(libdir)/pkgconfig
 pkgxmldatadir = $(pkgdatadir)/$(VERSION)/xml
@@ -559,9 +545,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/main/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/main/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/main/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/main/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -660,74 +646,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit-ops.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color-conversions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve-cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-ed.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-eventone.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-inks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-ordered.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-predithered.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dither-very-fast.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-channels.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-driver.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-inks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-papers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-resolutions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/generic-options.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-attr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-file.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-node.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mxml-search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/path.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-canon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-dither-matrices.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-escp2-data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-escp2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-lexmark.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-olympus.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-papers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-pcl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-ps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-raw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-vars.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-version.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/print-weave.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml.Plo@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -891,7 +817,6 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	clean-pkgmoduleLTLIBRARIES mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -918,7 +843,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/main/color-conversion.h b/src/main/color-conversion.h
index 28deb53..ab04380 100644
--- a/src/main/color-conversion.h
+++ b/src/main/color-conversion.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: color-conversion.h,v 1.10 2005/07/04 00:23:54 rlk Exp $"
+ * "$Id: color-conversion.h,v 1.11 2005/09/17 21:54:33 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gimp-Print algorithm.
  *
@@ -160,6 +160,7 @@ typedef struct
   double brightness;
   int linear_contrast_adjustment;
   int printed_colorfunc;
+  int simple_gamma_correction;
   stp_cached_curve_t hue_map;
   stp_cached_curve_t lum_map;
   stp_cached_curve_t sat_map;
diff --git a/src/main/curve-cache.c b/src/main/curve-cache.c
index 37b51b0..1ae7d0e 100644
--- a/src/main/curve-cache.c
+++ b/src/main/curve-cache.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: curve-cache.c,v 1.5 2004/09/17 18:38:17 rleigh Exp $"
+ * "$Id: curve-cache.c,v 1.6 2005/10/18 02:08:17 rlk Exp $"
  *
  *   Gimp-Print color management module - traditional Gimp-Print algorithm.
  *
@@ -88,7 +88,7 @@ stp_curve_cache_set_curve_copy(stp_cached_curve_t *cache, const stp_curve_t *cur
   cache->curve = stp_curve_create_copy(curve);
 }
 
-const size_t
+size_t
 stp_curve_cache_get_count(stp_cached_curve_t *cache)
 {
   if (cache->curve)
diff --git a/src/main/escp2-channels.c b/src/main/escp2-channels.c
index 2946e06..15392c2 100644
--- a/src/main/escp2-channels.c
+++ b/src/main/escp2-channels.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-channels.c,v 1.56 2005/07/03 22:13:36 rlk Exp $"
+ * "$Id: escp2-channels.c,v 1.58 2005/10/29 21:31:19 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -200,6 +200,13 @@ static const physical_subchannel_t standard_black_subchannels[] =
 
 DECLARE_INK_CHANNEL(standard_black);
 
+static const physical_subchannel_t f360_black_subchannels[] =
+{
+  { 0, 0, 1, "BlackDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_black);
+
 static const physical_subchannel_t x80_black_subchannels[] =
 {
   { 0, -1, 48, "BlackDensity", NULL }
@@ -389,12 +396,12 @@ static const physical_subchannel_t standard_photo_black_subchannels[] =
 
 DECLARE_INK_CHANNEL(standard_photo_black);
 
-static const physical_subchannel_t f360_r800_photo_black_subchannels[] =
+static const physical_subchannel_t f360_photo_black_subchannels[] =
 {
   { 0, 4, 1, "BlackDensity", NULL }
 };
 
-DECLARE_INK_CHANNEL(f360_r800_photo_black);
+DECLARE_INK_CHANNEL(f360_photo_black);
 
 static const physical_subchannel_t r800_matte_black_subchannels[] =
 {
@@ -410,19 +417,19 @@ static const physical_subchannel_t photo_black_subchannels[] =
 
 DECLARE_INK_CHANNEL(photo_black);
 
-static const physical_subchannel_t f360_photo_black_subchannels[] =
+static const physical_subchannel_t extended_black_subchannels[] =
 {
-  { 0, 0, 0, "BlackDensity", NULL }
+  { 0, 1, 0, "BlackDensity", NULL }
 };
 
-DECLARE_INK_CHANNEL(f360_photo_black);
+DECLARE_INK_CHANNEL(extended_black);
 
-static const physical_subchannel_t extended_black_subchannels[] =
+static const physical_subchannel_t f360_extended_black_subchannels[] =
 {
-  { 0, 1, 0, "BlackDensity", NULL }
+  { 0, 1, 1, "BlackDensity", NULL }
 };
 
-DECLARE_INK_CHANNEL(extended_black);
+DECLARE_INK_CHANNEL(f360_extended_black);
 
 static const physical_subchannel_t photo_cyan_subchannels[] =
 {
@@ -439,6 +446,13 @@ static const physical_subchannel_t extended_cyan_subchannels[] =
 
 DECLARE_INK_CHANNEL(extended_cyan);
 
+static const physical_subchannel_t f360_extended_cyan_subchannels[] =
+{
+  { 2, 1, 1, "CyanDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_extended_cyan);
+
 static const physical_subchannel_t photo_magenta_subchannels[] =
 {
   { 1, 0, 0, "MagentaDensity", NULL },
@@ -454,6 +468,13 @@ static const physical_subchannel_t extended_magenta_subchannels[] =
 
 DECLARE_INK_CHANNEL(extended_magenta);
 
+static const physical_subchannel_t f360_extended_magenta_subchannels[] =
+{
+  { 1, 1, 1, "MagentaDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_extended_magenta);
+
 static const physical_subchannel_t photo_yellow_subchannels[] =
 {
   { 4, 0, 0, "YellowDensity", NULL }
@@ -475,6 +496,20 @@ static const physical_subchannel_t j_extended_yellow_subchannels[] =
 
 DECLARE_INK_CHANNEL(j_extended_yellow);
 
+static const physical_subchannel_t extended_photo3_black_subchannels[] =
+{
+  { 0, 3, 0, "BlackDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(extended_photo3_black);
+
+static const physical_subchannel_t f360_extended_photo3_black_subchannels[] =
+{
+  { 0, 3, 1, "BlackDensity", NULL }
+};
+
+DECLARE_INK_CHANNEL(f360_extended_photo3_black);
+
 /* For Japanese 7-color printers, with dark yellow */
 static const physical_subchannel_t photo2_yellow_subchannels[] =
 {
@@ -508,6 +543,24 @@ static const physical_subchannel_t f360_photo2_black_subchannels[] =
 
 DECLARE_INK_CHANNEL(f360_photo2_black);
 
+static const physical_subchannel_t photo3_black_subchannels[] =
+{
+  { 0, 0, 0, "BlackDensity", NULL },
+  { 0, 1, 0, "BlackDensity", "GrayTransition" },
+  { 0, 3, 0, "BlackDensity", "LightGrayTransition" }
+};
+
+DECLARE_INK_CHANNEL(photo3_black);
+
+static const physical_subchannel_t f360_photo3_black_subchannels[] =
+{
+  { 0, 0, 1, "BlackDensity", NULL },
+  { 0, 1, 0, "BlackDensity", "GrayTransition" },
+  { 0, 3, 1, "BlackDensity", "LightGrayTransition" }
+};
+
+DECLARE_INK_CHANNEL(f360_photo3_black);
+
 static const physical_subchannel_t quadtone_subchannels[] =
 {
   { 0, -1, 0, "BlackDensity", NULL },
@@ -566,6 +619,14 @@ static const physical_subchannel_t f360_photo_cyan_subchannels[] =
 
 DECLARE_INK_CHANNEL(f360_photo_cyan);
 
+static const physical_subchannel_t f360x_photo_cyan_subchannels[] =
+{
+  { 2, 0, 0, "CyanDensity", NULL },
+  { 2, 1, 1, "CyanDensity", "LightCyanTransition" }
+};
+
+DECLARE_INK_CHANNEL(f360x_photo_cyan);
+
 static const physical_subchannel_t f360_photo_magenta_subchannels[] =
 {
   { 1, 0, 1, "MagentaDensity", NULL },
@@ -574,6 +635,14 @@ static const physical_subchannel_t f360_photo_magenta_subchannels[] =
 
 DECLARE_INK_CHANNEL(f360_photo_magenta);
 
+static const physical_subchannel_t f360x_photo_magenta_subchannels[] =
+{
+  { 1, 0, 0, "MagentaDensity", NULL },
+  { 1, 1, 1, "MagentaDensity", "LightMagentaTransition" }
+};
+
+DECLARE_INK_CHANNEL(f360x_photo_magenta);
+
 
 #define DECLARE_CHANNEL_SET(name)			\
 static const channel_set_t name##_channel_set =		\
@@ -642,7 +711,7 @@ const escp2_inkname_t stpi_escp2_default_photo_black_inkset =
 
 static const ink_channel_t *const standard_photo_gloss_black_channels[] =
 {
-  &f360_r800_photo_black_channel, &standard_gloss_channel
+  &f360_photo_black_channel, &standard_gloss_channel
 };
 
 DECLARE_CHANNEL_SET(standard_photo_gloss_black);
@@ -693,6 +762,41 @@ static const escp2_inkname_t f360_two_color_grayscale_inkset =
 /*
  ****************************************************************
  *                                                              *
+ * Three shade gray                                             *
+ *                                                              *
+ ****************************************************************
+ */
+
+static const ink_channel_t *const photo3_black_channels[] =
+{
+  &photo3_black_channel
+};
+
+DECLARE_CHANNEL_SET(photo3_black);
+
+static const escp2_inkname_t three_color_grayscale_inkset =
+{
+  "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
+  &photo3_black_channel_set
+};
+
+static const ink_channel_t *const f360_photo3_black_channels[] =
+{
+  &f360_photo3_black_channel
+};
+
+DECLARE_CHANNEL_SET(f360_photo3_black);
+
+static const escp2_inkname_t f360_three_color_grayscale_inkset =
+{
+  "Gray3", N_("Three Level Grayscale"), INKSET_CcMmYKk,
+  &f360_photo3_black_channel_set
+};
+
+
+/*
+ ****************************************************************
+ *                                                              *
  * Quadtone gray                                                *
  *                                                              *
  ****************************************************************
@@ -887,6 +991,19 @@ static const escp2_inkname_t three_color_r800_composite_inkset =
   &r800_cmy_channel_set
 };
 
+static const ink_channel_t *const r2400_cmy_channels[] =
+{
+  NULL, &standard_cyan_channel,
+  &f360_standard_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(r2400_cmy);
+
+static const escp2_inkname_t three_color_r2400_composite_inkset =
+{
+  "CMY", N_("Three Color Composite"), INKSET_CMYK,
+  &r2400_cmy_channel_set
+};
 
 /*
  ****************************************************************
@@ -938,9 +1055,23 @@ static const escp2_inkname_t four_color_r800_matte_inkset =
   &r800_cmyk_channel_set
 };
 
+static const ink_channel_t *const r2400_cmyk_channels[] =
+{
+  &f360_black_channel, &standard_cyan_channel,
+  &f360_standard_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(r2400_cmyk);
+
+static const escp2_inkname_t four_color_r2400_standard_inkset =
+{
+  "CMYK", N_("Four Color Standard"), INKSET_CMYK,
+  &r2400_cmyk_channel_set
+};
+
 static const ink_channel_t *const photo_gloss_cmyk_channels[] =
 {
-  &f360_r800_photo_black_channel, &f360_standard_cyan_channel,
+  &f360_photo_black_channel, &f360_standard_cyan_channel,
   &standard_magenta_channel, &f360_standard_yellow_channel,
   &standard_gloss_channel
 };
@@ -949,7 +1080,7 @@ DECLARE_CHANNEL_SET(photo_gloss_cmyk);
 
 static const ink_channel_t *const r800_photo_cmyk_channels[] =
 {
-  &f360_r800_photo_black_channel, &f360_standard_cyan_channel,
+  &f360_photo_black_channel, &f360_standard_cyan_channel,
   &standard_magenta_channel, &f360_standard_yellow_channel,
 };
 
@@ -1069,6 +1200,20 @@ static const escp2_inkname_t f360_five_color_photo_composite_inkset =
   &f360_photo_composite_channel_set
 };
 
+static const ink_channel_t *const five_color_photo3_channels[] =
+{
+  NULL, &f360x_photo_cyan_channel,
+  &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(five_color_photo3);
+
+static const escp2_inkname_t five_color_photo3_inkset =
+{
+  "PhotoCMY", N_("Five Color Photo Composite"), INKSET_CcMmYK,
+  &five_color_photo3_channel_set
+};
+
 
 /*
  ****************************************************************
@@ -1094,7 +1239,7 @@ static const escp2_inkname_t six_color_photo_inkset =
 
 static const ink_channel_t *const f360_photo_channels[] =
 {
-  &f360_photo_black_channel, &f360_photo_cyan_channel,
+  &standard_black_channel, &f360_photo_cyan_channel,
   &f360_photo_magenta_channel, &f360_photo_yellow_channel
 };
 
@@ -1106,6 +1251,19 @@ static const escp2_inkname_t f360_six_color_photo_inkset =
   &f360_photo_channel_set
 };
 
+static const ink_channel_t *const six_color_photo3_channels[] =
+{
+  &f360_black_channel, &f360x_photo_cyan_channel,
+  &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(six_color_photo3);
+
+static const escp2_inkname_t six_color_photo3_inkset =
+{
+  "PhotoCMYK", N_("Six Color Photo"), INKSET_CcMmYK,
+  &six_color_photo3_channel_set
+};
 
 /*
  ****************************************************************
@@ -1180,6 +1338,20 @@ static const escp2_inkname_t f360_seven_color_enhanced_inkset =
   &f360_photo2_channel_set
 };
 
+static const ink_channel_t *const seven_color_photo3_channels[] =
+{
+  &f360_photo2_black_channel, &f360x_photo_cyan_channel,
+  &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(seven_color_photo3);
+
+static const escp2_inkname_t seven_color_photo3_inkset =
+{
+  "PhotoCMYK7", N_("Seven Color Photo"), INKSET_CcMmYKk,
+  &seven_color_photo3_channel_set
+};
+
 /*
  ****************************************************************
  *                                                              *
@@ -1204,7 +1376,7 @@ static const escp2_inkname_t j_seven_color_enhanced_inkset =
 
 static const ink_channel_t *const f360_photoj_channels[] =
 {
-  &f360_photo_black_channel, &f360_photo_cyan_channel,
+  &standard_black_channel, &f360_photo_cyan_channel,
   &f360_photo_magenta_channel, &f360_photo2_yellow_channel
 };
 
@@ -1220,6 +1392,29 @@ static const escp2_inkname_t f360_j_seven_color_enhanced_inkset =
 /*
  ****************************************************************
  *                                                              *
+ * Eight color CcMmYKkk                                         *
+ *                                                              *
+ ****************************************************************
+ */
+
+static const ink_channel_t *const photo3_channels[] =
+{
+  &f360_photo3_black_channel, &f360x_photo_cyan_channel,
+  &f360_photo_magenta_channel, &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(photo3);
+
+static const escp2_inkname_t eight_color_enhanced_inkset =
+{
+  "PhotoCMYK8", N_("Eight Color Photo"), INKSET_CcMmYKk,
+  &photo3_channel_set
+};
+
+
+/*
+ ****************************************************************
+ *                                                              *
  * Five color CMYRB                                             *
  *                                                              *
  ****************************************************************
@@ -1298,7 +1493,7 @@ static const escp2_inkname_t six_color_r800_inkset =
 
 static const ink_channel_t *const six_color_r800_photo_channels[] =
 {
-  &f360_r800_photo_black_channel, &r800_cyan_channel,
+  &f360_photo_black_channel, &r800_cyan_channel,
   &r800_magenta_channel, &r800_yellow_channel,
   &r800_red_channel, &r800_blue_channel
 };
@@ -1313,7 +1508,7 @@ static const escp2_inkname_t six_color_r800_photo_inkset =
 
 static const ink_channel_t *const six_color_r800_photo_gloss_channels[] =
 {
-  &f360_r800_photo_black_channel, &f360_standard_cyan_channel,
+  &f360_photo_black_channel, &f360_standard_cyan_channel,
   &r800_magenta_channel, &r800_yellow_channel,
   &r800_red_channel, &r800_blue_channel,
   &standard_gloss_channel
@@ -1376,7 +1571,7 @@ static const escp2_inkname_t two_color_extended_inkset =
 
 static const ink_channel_t *const f360_two_color_extended_channels[] =
 {
-  &f360_photo_black_channel, &extended_black_channel
+  &standard_black_channel, &extended_black_channel
 };
 DECLARE_CHANNEL_SET(f360_two_color_extended);
 
@@ -1603,7 +1798,7 @@ static const escp2_inkname_t six_color_r800_extended_inkset =
 
 static const ink_channel_t *const f360_six_color_extended_channels[] =
 {
-  &f360_photo_black_channel,
+  &standard_black_channel,
   &f360_standard_cyan_channel, &extended_cyan_channel,
   &f360_standard_magenta_channel, &extended_magenta_channel,
   &f360_photo_yellow_channel
@@ -1654,7 +1849,7 @@ static const escp2_inkname_t seven_color_extended_inkset =
 
 static const ink_channel_t *const f360_seven_color_extended_channels[] =
 {
-  &f360_photo_black_channel, &extended_black_channel,
+  &standard_black_channel, &extended_black_channel,
   &f360_standard_cyan_channel, &extended_cyan_channel,
   &f360_standard_magenta_channel, &extended_magenta_channel,
   &f360_photo_yellow_channel
@@ -1670,7 +1865,7 @@ static const escp2_inkname_t f360_seven_color_extended_inkset =
 
 static const ink_channel_t *const seven_color_r800_gloss_extended_channels[] =
 {
-  &standard_black_channel, &f360_r800_photo_black_channel,
+  &standard_black_channel, &f360_photo_black_channel,
   &r800_cyan_channel, &r800_magenta_channel,
   &r800_yellow_channel, &r800_red_channel,
   &r800_blue_channel, &standard_gloss_channel
@@ -1685,6 +1880,23 @@ static const escp2_inkname_t seven_color_r800_gloss_extended_inkset =
 };
 
 
+static const ink_channel_t *const eight_color_extended_channels[] =
+{
+  &f360_black_channel, &extended_black_channel,
+  &f360_extended_photo3_black_channel,
+  &standard_cyan_channel, &f360_extended_cyan_channel,
+  &f360_standard_magenta_channel, &extended_magenta_channel,
+  &standard_yellow_channel
+};
+
+DECLARE_CHANNEL_SET(eight_color_extended);
+
+static const escp2_inkname_t eight_color_extended_inkset =
+{
+  "PhysicalCMYKkk", N_("Eight Color Raw"), INKSET_EXTENDED,
+  &eight_color_extended_channel_set
+};
+
 
 static const shade_set_t standard_shades =
 {
@@ -1725,8 +1937,8 @@ static const shade_set_t photo_gen2_shades =	/* Stylus 870 and newer */
 static const shade_set_t photo_gen3_shades =	/* Stylus R300 and newer */
 {
   { 1, { 1.0 }},
-  { 2, { 1.0, 0.3 }},
-  { 2, { 1.0, 0.3 }},
+  { 2, { 1.0, 0.35 }},
+  { 2, { 1.0, 0.35 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
   { 1, { 1.0 }},
@@ -1782,6 +1994,30 @@ static const shade_set_t ultrachrome_matte_shades =	/* Ultrachrome with matte bl
   { 1, { 1.0 }},
 };
 
+static const shade_set_t ultra3_photo_shades =	/* R2400 with photo black ink */
+{
+  { 3, { 1.0, 0.555, 0.185 }},
+  { 2, { 1.0, 0.25 }},
+  { 2, { 1.0, 0.25 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+};
+
+static const shade_set_t ultra3_matte_shades =	/* R2400 with matte black ink */
+{
+  { 3, { 1.0, 0.278, 0.093 }},
+  { 2, { 1.0, 0.25 }},
+  { 2, { 1.0, 0.25 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+  { 1, { 1.0 }},
+};
+
 static const shade_set_t quadtone_shades =	/* Some kind of quadtone ink */
 {
   { 4, { 1.0, 0.75, 0.5, 0.25 }},
@@ -2038,6 +2274,25 @@ DECLARE_INKLIST("ultramatte", ultra_matte7, photo7,
 		N_("UltraChrome Matte Black"), ultrachrome,
 		ultrachrome_matte, ultrachrome_matte);
 
+static const escp2_inkname_t *const f360_photo8_ink_types[] =
+{
+  &eight_color_enhanced_inkset,
+  &seven_color_photo3_inkset,
+  &six_color_photo3_inkset,
+  &five_color_photo3_inkset,
+  &four_color_r2400_standard_inkset,
+  &three_color_r2400_composite_inkset,
+  &eight_color_extended_inkset,
+};
+
+DECLARE_INKLIST("ultra3photo", f360_ultra_photo8, f360_photo8,
+		N_("Photo Black"), ultrachrome_k3,
+		ultrachrome_k3_photo, ultra3_photo);
+
+DECLARE_INKLIST("ultra3matte", f360_ultra_matte8, f360_photo8,
+		N_("Matte Black"), ultrachrome_k3,
+		ultrachrome_k3_matte, ultra3_matte);
+
 static const escp2_inkname_t *const cmykrb_matte_ink_types[] =
 {
   &six_color_r800_inkset,
@@ -2203,6 +2458,14 @@ static const inklist_t *const ultrachrome_group[] =
 
 DECLARE_INKGROUP(ultrachrome);
 
+static const inklist_t *const f360_ultrachrome_k3_group[] =
+{
+  &f360_ultra_photo8_inklist,
+  &f360_ultra_matte8_inklist
+};
+
+DECLARE_INKGROUP(f360_ultrachrome_k3);
+
 static const inklist_t *const cmykrb_group[] =
 {
   &cmykrb_photo_inklist,
diff --git a/src/main/escp2-inks.c b/src/main/escp2-inks.c
index 6b26b7f..eaffd03 100644
--- a/src/main/escp2-inks.c
+++ b/src/main/escp2-inks.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-inks.c,v 1.41 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: escp2-inks.c,v 1.42 2005/10/23 19:43:14 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -127,6 +127,20 @@ static const escp2_dropsize_t escp2_r300_2880_dropsizes =
 static const escp2_dropsize_t escp2_r300_2880_1440_dropsizes =
   { "r300_2880_1440", 1, { 1.0 } };
 
+/* Stylus Photo R2400 */
+static const escp2_dropsize_t escp2_r2400_360_dropsizes =
+  { "r2400_360", 1, { 1 } };
+static const escp2_dropsize_t escp2_r2400_720_dropsizes =
+  { "r2400_1440", 3, { 0.180, 0.44, 1 } };
+static const escp2_dropsize_t escp2_r2400_1440_dropsizes =
+  { "r2400_1440", 3, { 0.180, 0.44, 1 } };
+static const escp2_dropsize_t escp2_r2400_2880_dropsizes =
+  { "r2400_1440", 3, { 0.180, 0.44, 1 } };
+static const escp2_dropsize_t escp2_r2400_2880_1440_dropsizes =
+  { "r2400_2880_1440", 2, { 0.41, 1 } };
+static const escp2_dropsize_t escp2_r2400_2880_2880_dropsizes =
+  { "r2400_2880_2880", 1, { 1.0 } };
+
 /* Stylus C80 */
 static const escp2_dropsize_t escp2_economy_pigment_dropsizes =
   { "economy_pigment", 3, { 0, 0, 1.0 } };
@@ -275,6 +289,19 @@ const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops =
   &escp2_r300_2880_1440_dropsizes,
 };
 
+const escp2_drop_list_t stpi_escp2_variable_r2400_drops =
+{
+  &escp2_r2400_360_dropsizes,
+  &escp2_r2400_360_dropsizes,
+  &escp2_r2400_720_dropsizes,
+  &escp2_r2400_720_dropsizes,
+  &escp2_r2400_1440_dropsizes,
+  &escp2_r2400_2880_dropsizes,
+  &escp2_r2400_2880_1440_dropsizes,
+  &escp2_r2400_2880_2880_dropsizes,
+  &escp2_r2400_2880_2880_dropsizes,
+};
+
 const escp2_drop_list_t stpi_escp2_variable_1_5pl_drops =
 {
   &escp2_1_5pl_360_dropsizes,
diff --git a/src/main/escp2-papers.c b/src/main/escp2-papers.c
index 24a6e92..3980be0 100644
--- a/src/main/escp2-papers.c
+++ b/src/main/escp2-papers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-papers.c,v 1.80 2005/08/14 14:55:22 rleigh Exp $"
+ * "$Id: escp2-papers.c,v 1.84 2005/10/30 00:57:40 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -141,12 +141,12 @@ static const char photo3_lum_adj[] =
 "<gutenprint>\n"
 "<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
 "<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
-/* C */  "0.60 0.61 0.64 0.68 0.73 0.78 0.82 0.85 "  /* B */
-/* B */  "0.85 0.82 0.78 0.78 0.79 0.80 0.82 0.85 "  /* M */
+/* C */  "0.66 0.67 0.69 0.73 0.77 0.83 0.87 0.89 "  /* B */
+/* B */  "0.91 0.88 0.82 0.78 0.78 0.80 0.82 0.85 "  /* M */
 /* M */  "0.87 0.90 0.94 0.97 1.00 1.00 1.00 1.00 "  /* R */
 /* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
 /* Y */  "1.00 1.00 0.99 0.98 0.96 0.94 0.92 0.88 "  /* G */
-/* G */  "0.84 0.72 0.68 0.66 0.64 0.62 0.61 0.60 "  /* C */
+/* G */  "0.84 0.72 0.69 0.67 0.66 0.66 0.66 0.66 "  /* C */
 "</sequence>\n"
 "</curve>\n"
 "</gutenprint>\n";
@@ -349,6 +349,97 @@ static const char ultra_glossy_hue_adj[] =
 "</gutenprint>\n";
 
 
+static const char ultra_k3_matte_sat_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
+/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 "  /* M */
+/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
+/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
+/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_matte_lum_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "0.49 0.51 0.55 0.61 0.67 0.71 0.76 0.79 "  /* B */
+/* B */  "0.83 0.80 0.76 0.76 0.78 0.79 0.83 0.86 "  /* M */
+/* M */  "0.93 0.95 0.97 0.97 0.97 0.97 0.96 0.96 "  /* R */
+/* R */  "0.96 0.97 0.97 0.98 0.99 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 0.98 0.97 0.95 0.93 0.91 0.88 0.83 "  /* G */
+/* G */  "0.75 0.64 0.58 0.54 0.52 0.51 0.50 0.49 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_matte_hue_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
+/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
+/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
+/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
+/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.17 -.18 "  /* G */
+/* G */  "-.19 -.20 -.19 -.18 -.16 -.12 -.08 -.04 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_glossy_sat_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "1.00 1.00 1.00 1.05 1.10 1.15 1.15 1.15 "  /* B */
+/* B */  "1.15 1.15 1.15 1.10 1.10 1.05 1.05 1.00 "  /* M */
+/* M */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* R */
+/* R */  "1.00 1.00 1.00 1.00 1.00 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 1.05 1.15 1.25 1.35 1.45 1.50 1.50 "  /* G */
+/* G */  "1.50 1.50 1.50 1.45 1.35 1.25 1.15 1.05 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_glossy_lum_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"0\" upper-bound=\"4\">\n"
+/* C */  "0.49 0.53 0.60 0.64 0.67 0.69 0.72 0.75 "  /* B */
+/* B */  "0.75 0.71 0.70 0.70 0.72 0.76 0.81 0.87 "  /* M */
+/* M */  "0.93 0.95 0.97 0.98 0.98 0.97 0.96 0.96 "  /* R */
+/* R */  "0.96 0.97 0.98 0.98 0.99 1.00 1.00 1.00 "  /* Y */
+/* Y */  "1.00 0.98 0.97 0.96 0.95 0.93 0.90 0.87 "  /* G */
+/* G */  "0.83 0.69 0.61 0.55 0.53 0.52 0.50 0.49 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+static const char ultra_k3_glossy_hue_adj[] =
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+"<gutenprint>\n"
+"<curve wrap=\"wrap\" type=\"linear\" gamma=\"0\">\n"
+"<sequence count=\"48\" lower-bound=\"-6\" upper-bound=\"6\">\n"
+/* C */  "0.00 0.06 0.10 0.10 0.06 0.00 -.06 -.12 "  /* B */
+/* B */  "-.18 -.21 -.22 -.22 -.22 -.22 -.22 -.22 "  /* M */
+/* M */  "-.22 -.28 -.34 -.40 -.50 -.40 -.30 -.20 "  /* R */
+/* R */  "-.12 -.07 -.04 -.02 0.00 0.00 0.00 0.00 "  /* Y */
+/* Y */  "0.00 -.00 -.03 -.07 -.11 -.15 -.19 -.22 "  /* G */
+/* G */  "-.25 -.22 -.19 -.15 -.12 -.10 -.06 -.03 "  /* C */
+"</sequence>\n"
+"</curve>\n"
+"</gutenprint>\n";
+
+
 static const char r800_matte_sat_adj[] =
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 "<gutenprint>\n"
@@ -590,43 +681,43 @@ DECLARE_PAPER_ADJUSTMENTS(photo2);
 
 static const paper_adjustment_t photo3_adjustments[] =
 {
-  { "Plain", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+  { "Plain",        0.615, .35, 0.75, .15, .9, 1, .7, .8, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "PlainFast", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+  { "PlainFast",    0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Postcard", 0.83, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
+  { "Postcard",     0.692, .35, 0.5, .2, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+  { "GlossyFilm",   0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Transparency", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+  { "Transparency", 0.833, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Envelope", 0.738, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
+  { "Envelope",     0.615, .35, 0.75, .15, .9, 1, .59, .7, .9, 1, 1.0,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "BackFilm", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+  { "BackFilm",     0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Matte", 0.85, .35, 0.75, .3, .999, 1, .59, .7, .9, 1, 1,
+  { "Matte",        0.833, .35, 0.5, .25, .999, 1, .63, .72, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "MatteHeavy", 0.85, .35, .3, .3, .999, 1, .59, .7, .9, 1, 1,
+  { "MatteHeavy",   0.833, .35, 0.5, .25, .999, 1, .63, .72, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Inkjet", 0.85, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+  { "Inkjet",       0.709, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Coated", 1.2, .35, .5, .3, .999, 1, .59, .7, .9, 1, 1,
+  { "Coated",       0.833, .45, 0.5, .25, .999, 1, .76, .84, .66, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Photo", 1.00, .35, 0.5, .3, .999, 1, .59, .7, .9, 1, 1,
+  { "Photo",        0.833, .5, 0.5, .25, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPhoto", 1.0, .25, 0.5, .3, .999, 1, .6, .83, .66, 1, 0.85,
+  { "GlossyPhoto",  0.833, .75, 0.5, .25, .999, 1, .7, .8, .66, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Semigloss", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
+  { "Semigloss",    0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Luster", 1.0, .25, 0.5, .3, .999, 1, .59, .7, .9, 1, 0.92,
+  { "Luster",       0.833, .75, 0.5, .3, .999, 1, .7, .8, .66, 1, 0.92,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "GlossyPaper", 1.00, .35, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+  { "GlossyPaper",  0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Ilford", .85, .25, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
+  { "Ilford",       0.833, .5, 0.75, .2, .999, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj  },
-  { "ColorLife", 1.00, .35, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
+  { "ColorLife",    0.833, .5, 0.75, .2, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
-  { "Other", 0.738, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
+  { "Other",        0.615, .35, 0.5, .5, .9, 1, .59, .7, .9, 1, 1,
     photo3_hue_adj, photo3_lum_adj, photo3_sat_adj },
 };
 
@@ -770,6 +861,100 @@ static const paper_adjustment_t ultrachrome_matte_adjustments[] =
 
 DECLARE_PAPER_ADJUSTMENTS(ultrachrome_matte);
 
+static const paper_adjustment_t ultrachrome_k3_photo_adjustments[] =
+{
+  { "Plain", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "PlainFast", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Postcard", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "GlossyFilm", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Transparency", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Envelope", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "BackFilm", 0.83, .75, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Matte", 0.92, 0.8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "MatteHeavy", 0.92, 0.8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Inkjet", 0.72, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Coated", 0.83, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Photo", 1.0, .5, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "GlossyPhoto", 0.72, 1, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+  { "Semigloss", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+  { "Luster", 0.72, .8, 1, .01, 1.8, 1, 1, 1, 1, 1, .92,
+    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+  { "ArchivalMatte", 0.92, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "WaterColorRadiant", 0.92, .8, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "GlossyPaper", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Ilford", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
+  { "ColorLife", 0.83, 1.0, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Other", 0.72, .1, 1, .01, 1.5, 1, 1, 1, 1, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_photo);
+
+static const paper_adjustment_t ultrachrome_k3_matte_adjustments[] =
+{
+  { "Plain", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "PlainFast", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Postcard", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "GlossyFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Transparency", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Envelope", 0.72, .1, 1, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "BackFilm", 0.83, .5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Matte", 0.92, 0.5, 1, 0.00, 1.25, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "MatteHeavy", 0.92, 0.4, .4, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Inkjet", 0.72, .3, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Coated", 0.83, .4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Photo", 1.0, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "GlossyPhoto", 0.72, 1, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
+    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+  { "Semigloss", 0.72, .8, 1, .01, 0.5, 1, 1, 1, .6, 1, .92,
+    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+  { "Luster", 0.72, .8, 1, .01, 0.5, 1, 1, 1, 1, .5, .92,
+    ultra_k3_glossy_hue_adj, ultra_k3_glossy_lum_adj, ultra_k3_glossy_sat_adj },
+  { "WaterColorRadiant", 0.92, 0.4, 1, .01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "GlossyPaper", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Ilford", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj  },
+  { "ColorLife", 0.83, 0.5, 1, 0.01, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+  { "Other", 0.72, .1, .4, 0, 0.5, 1, 1, 1, .6, 1, 1.0,
+    ultra_k3_matte_hue_adj, ultra_k3_matte_lum_adj, ultra_k3_matte_sat_adj },
+};
+
+DECLARE_PAPER_ADJUSTMENTS(ultrachrome_k3_matte);
+
 static const paper_adjustment_t r800_photo_adjustments[] =
 {
   { "Plain", 0.72, .1, 1, .02, 1.4, .882, 1, .300, 1, 1, 1.0,
@@ -1096,6 +1281,54 @@ static const paper_t ultrachrome_papers[] =
 
 DECLARE_PAPERS(ultrachrome);
 
+static const paper_t ultrachrome_k3_papers[] =
+{
+  { "Plain", N_("Plain Paper"), PAPER_PLAIN,
+    1, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+  { "PlainFast", N_("Plain Paper Fast Load"), PAPER_PLAIN,
+    5, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+  { "Postcard", N_("Postcard"), PAPER_PLAIN,
+    2, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+  { "GlossyFilm", N_("Glossy Film"), PAPER_PHOTO,
+    3, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
+  { "Transparency", N_("Transparencies"), PAPER_TRANSPARENCY,
+    3, 0, 0x6d, 0x00, 0x02, NULL, "UltraPhoto" },
+  { "Envelope", N_("Envelopes"), PAPER_PLAIN,
+    4, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+  { "BackFilm", N_("Back Light Film"), PAPER_TRANSPARENCY,
+    6, 0, 0x6d, 0x00, 0x01, NULL, "UltraPhoto" },
+  { "Matte", N_("Matte Paper"), PAPER_GOOD,
+    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+  { "MatteHeavy", N_("Matte Paper Heavyweight"), PAPER_GOOD,
+    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+  { "Inkjet", N_("Inkjet Paper"), PAPER_GOOD,
+    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+  { "Coated", N_("Photo Quality Inkjet Paper"), PAPER_GOOD,
+    7, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
+  { "Photo", N_("Photo Paper"), PAPER_PHOTO,
+    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
+  { "GlossyPhoto", N_("Premium Glossy Photo Paper"), PAPER_PREMIUM_PHOTO,
+    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
+  { "Semigloss", N_("Premium Semigloss Photo Paper"), PAPER_PREMIUM_PHOTO,
+    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
+  { "Luster", N_("Premium Luster Photo Paper"), PAPER_PREMIUM_PHOTO,
+    8, 0, 0x80, 0x00, 0x02, NULL, "UltraPhoto" },
+  { "ArchivalMatte", N_("Archival Matte Paper"), PAPER_PREMIUM_PHOTO,
+    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+  { "WaterColorRadiant", N_("Watercolor Paper - Radiant White"), PAPER_PREMIUM_PHOTO,
+    7, 0, 0x00, 0x00, 0x02, NULL, "UltraMatte" },
+  { "GlossyPaper", N_("Photo Quality Glossy Paper"), PAPER_PHOTO,
+    6, 0, 0x6b, 0x1a, 0x01, NULL, "UltraPhoto" },
+  { "Ilford", N_("Ilford Heavy Paper"), PAPER_PREMIUM_PHOTO,
+    8, 0, 0x80, 0x00, 0x02, NULL, "UltraMatte" },
+  { "ColorLife", N_("ColorLife Paper"), PAPER_PREMIUM_PHOTO,
+    8, 0, 0x67, 0x00, 0x02, NULL, "UltraPhoto" },
+  { "Other", N_("Other"), PAPER_PLAIN,
+    0, 0, 0x6b, 0x1a, 0x01, NULL, "UltraMatte" },
+};
+
+DECLARE_PAPERS(ultrachrome_k3);
+
 static const paper_t durabrite2_papers[] =
 {
   { "Plain", N_("Plain Paper"), PAPER_PLAIN,
diff --git a/src/main/escp2-resolutions.c b/src/main/escp2-resolutions.c
index 011e2ef..419cf48 100644
--- a/src/main/escp2-resolutions.c
+++ b/src/main/escp2-resolutions.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: escp2-resolutions.c,v 1.28 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: escp2-resolutions.c,v 1.29 2005/10/23 19:43:14 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -106,6 +106,9 @@ static const res_t r_1440x720sw =
 static const res_t r_1440x720hq2 =
 { "1440x720hq2",   N_("1440 x 720 DPI Highest Quality"),
   1440, 720,  1440, 720,  1, 0, 2 };
+static const res_t r_720x1440sw =
+{ "720x1440sw",    N_("1440 x 720 DPI Transposed"),
+  720, 1440,  720, 1440,  1, 0, 1 };
 
 static const res_t r_2880x720mw =
 { "2880x720mw",    N_("2880 x 720 DPI"),
@@ -133,6 +136,9 @@ static const res_t r_2880x1440mw =
 static const res_t r_2880x1440sw =
 { "2880x1440sw",   N_("2880 x 1440 DPI"),
   2880, 1440,  2880, 1440, 1, 0, 1};
+static const res_t r_1440x2880sw =
+{ "1440x2880sw",   N_("2880 x 1440 DPI Transposed"),
+  1440, 2880,  1440, 2880, 1, 0, 1};
 
 static const res_t r_2880x2880mw =
 { "2880x2880mw",   N_("2880 x 2880 DPI"),
@@ -243,12 +249,14 @@ const res_t *const stpi_escp2_2880_1440dpi_reslist[] =
   &r_720sw,
 
   &r_1440x720sw,
+  &r_720x1440sw,
 
   &r_2880x720sw,
 
   &r_1440x1440sw,
 
   &r_2880x1440sw,
+  &r_1440x2880sw,
 
   &r_2880x2880sw,
 
@@ -296,10 +304,12 @@ const res_t *const stpi_escp2_superfine_reslist[] =
   &r_720sw,
 
   &r_1440x720sw,
+  &r_720x1440sw,
 
   &r_1440x1440ov,
 
   &r_2880x1440sw,
+  &r_1440x2880sw,
 
   &r_2880x2880sw,
 
diff --git a/src/main/path.c b/src/main/path.c
index 86e131b..d59c625 100644
--- a/src/main/path.c
+++ b/src/main/path.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: path.c,v 1.17 2004/09/17 18:38:21 rleigh Exp $"
+ * "$Id: path.c,v 1.18 2005/10/18 02:08:17 rlk Exp $"
  *
  *   Gutenprint path functions - split and search paths.
  *
@@ -63,7 +63,7 @@ stp_path_search(stp_list_t *dirlist, /* List of directories to search */
 {
   stp_list_t *findlist;              /* List of files to return */
   stp_list_item_t *diritem;          /* Current directory */
-  struct dirent** module_dir;        /* Current directory contents */
+  struct dirent** module_dir = NULL; /* Current directory contents */
   char *module_name;                 /* File name to check */
   int n;                             /* Number of directory entries */
 
diff --git a/src/main/print-canon.c b/src/main/print-canon.c
index a0d2dcb..53b56b0 100644
--- a/src/main/print-canon.c
+++ b/src/main/print-canon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-canon.c,v 1.163 2005/08/25 23:40:40 rlk Exp $"
+ * "$Id: print-canon.c,v 1.167 2005/10/21 13:31:41 faust3 Exp $"
  *
  *   Print plug-in CANON BJL driver for the GIMP.
  *
@@ -55,7 +55,7 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-
+#include <math.h>
 /* Solaris with gcc has problems because gcc's limits.h doesn't #define */
 /* this */
 #ifndef CHAR_BIT
@@ -763,6 +763,18 @@ typedef struct
   int bits;
   int ydpi;
   color_info_t color_info[9]; /* C,M,Y,K,c,m,y,k,? */
+  int ncolors; /* number of colors to print with */
+  int physical_xdpi, nozzle_ydpi, stepper_ydpi;
+  int nozzles;   /* count of inkjets for one pass */
+  int nozzle_separation;
+  int horizontal_passes;
+  int vertical_passes;
+  int vertical_oversample;
+  int *head_offset;
+  int last_pass_offset;
+  int bidirectional; /* tells us if we are allowed to print bidirectional */
+  int direction;     /* stores the last direction of the print head */
+
 } canon_privdata_t;
 
 static void canon_write_line(stp_vars_t *v);
@@ -805,8 +817,12 @@ static void canon_write_line(stp_vars_t *v);
 #define CANON_CAP_r         0x800ul
 #define CANON_CAP_g         0x1000ul
 #define CANON_CAP_ACKSHORT  0x2000ul
-#define CANON_CAP_extended_t    0x4000ul  /* detailed level and bitdepth settings for every ink*/
-#define CANON_CAP_5pixelin1byte 0x8000ul  /* 5 pixel with 3 levels in 1 byte compression */
+#define CANON_CAP_rr        0x4000ul
+#define CANON_CAP_WEAVE     0x8000ul   /* S200 has to be fed with weaved data */
+                                       /* for Resolutions above 360dpi */
+#define CANON_CAP_extended_t    0x10000ul  /* detailed level and bitdepth settings for every ink*/
+#define CANON_CAP_5pixelin1byte 0x20000ul  /* 5 pixel with 3 levels in 1 byte compression */
+#define CANON_CAP_DUPLEX    0x40000ul
 
 #define CANON_CAP_STD0 (CANON_CAP_b|CANON_CAP_c|CANON_CAP_d|\
                         CANON_CAP_l|CANON_CAP_q|CANON_CAP_t)
@@ -894,6 +910,27 @@ static const canon_cap_t canon_model_capabilities[] =
   /*                                      */
   /* ************************************ */
 
+  { /* Canon S200x *//* heads: BC-24 */
+    4202, 3,
+    618, 936,       /* 8.58" x 13 " */
+    180, 2880, 2880, 4,
+    10, 10, 9, 20,
+    CANON_INK_CMYK | CANON_INK_CMY | CANON_INK_K,
+    CANON_SLOT_ASF1,
+    CANON_CAP_STD1 | CANON_CAP_rr | CANON_CAP_WEAVE,
+    CANON_MODES(canon_nomodes),
+#ifndef EXPERIMENTAL_STUFF
+/*   2880dpi Resolutions: TBD */
+/* 180x180 360x360 720x720 1440x720 1440x1440 2880x2880 */
+    {-1,      0,      0,       0,       0,        -1},
+/*-------  360x360 720x720 1440x720  1440x1440 ---------*/
+    { 1,     2,       1,     0.5,     0.3,        0.2},
+    CANON_INK(canon_ink_standard),
+#endif
+    standard_lum_adjustment,
+    standard_hue_adjustment,
+    standard_sat_adjustment
+  },
 
   { /* Canon  BJ 30   *//* heads: BC-10 */
     30, 1,
@@ -1304,7 +1341,7 @@ static const canon_cap_t canon_model_capabilities[] =
     11, 9, 10, 18,    /*border_left, border_right, border_top, border_bottom */
     CANON_INK_CMYK /*| CANON_INK_CcMmYyK*/, /*canon inks */
     CANON_SLOT_ASF1,  /*paper slot */
-    CANON_CAP_STD0|CANON_CAP_extended_t|CANON_CAP_5pixelin1byte,  /*features */
+    CANON_CAP_STD0|CANON_CAP_extended_t|CANON_CAP_5pixelin1byte|CANON_CAP_DUPLEX,  /*features */
     CANON_MODES(canon_nomodes),
 #ifndef EXPERIMENTAL_STUFF
     {-1,0,0,-1,-1,-1}, /*150x150 300x300 600x600 1200x600 1200x1200 2400x2400*/
@@ -1375,10 +1412,12 @@ typedef struct {
 typedef struct {
   const canon_cap_t *caps;
   int printing_color;
+  int is_first_page;
   const paper_t *pt;
   int print_head;
   int colormode;
   const char *source_str;
+  const char *duplex_str;
   int xdpi;
   int ydpi;
   int page_width;
@@ -1406,6 +1445,8 @@ static const paper_t canon_paper_list[] = {
 };
 
 static const int paper_type_count = sizeof(canon_paper_list) / sizeof(paper_t);
+static void canon_advance_paper(stp_vars_t *, int);
+static void canon_flush_pass(stp_vars_t *, int, int);
 
 static const stp_parameter_t the_parameters[] =
 {
@@ -1451,6 +1492,12 @@ static const stp_parameter_t the_parameters[] =
     STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
     STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
   },
+  {
+    "Duplex", N_("Double-Sided Printing"), N_("Basic Printer Setup"),
+    N_("Duplex/Tumble Setting"),
+    STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
+    STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
+  }
 };
 
 static const int the_parameter_count =
@@ -1529,6 +1576,24 @@ static const float_param_t float_parameters[] =
 static const int float_parameter_count =
 sizeof(float_parameters) / sizeof(const float_param_t);
 
+/*
+ * Duplex support - modes available
+ * Note that the internal names MUST match those in cups/genppd.c else the
+ * PPD files will not be generated correctly
+ *
+ * TODO: Support for DuplexNoTumble, the image has to be rotated 
+ */
+
+static const stp_param_string_t duplex_types[] =
+{
+  { "None",             N_ ("Off") },
+/*  { "DuplexNoTumble", N_ ("Long Edge (Standard)") } , */
+  { "DuplexTumble",     N_ ("Short Edge (Flip)") }
+};
+#define NUM_DUPLEX (sizeof (duplex_types) / sizeof (stp_param_string_t))
+
+
+
 static const paper_t *
 get_media_type(const char *name)
 {
@@ -1566,6 +1631,8 @@ canon_source_type(const char *name, const canon_cap_t * caps)
       if (!strcmp(name,"Auto"))    return 4;
       if (!strcmp(name,"Manual"))    return 0;
       if (!strcmp(name,"ManualNP")) return 1;
+      if (!strcmp(name,"Cassette")) return 8;
+      if (!strcmp(name,"CD")) return 10;
     }
 
   stp_deprintf(STP_DBG_CANON,"canon: Unknown source type '%s' - reverting to auto\n",name);
@@ -1833,7 +1900,9 @@ static const stp_param_string_t media_sources[] =
               {
                 { "Auto",	N_ ("Auto Sheet Feeder") },
                 { "Manual",	N_ ("Manual with Pause") },
-                { "ManualNP",	N_ ("Manual without Pause") }
+                { "ManualNP",	N_ ("Manual without Pause") },
+		{ "Cassette",   N_ ("Cassette") },
+		{ "CD", N_ ("CD tray") }
               };
 
 
@@ -1989,7 +2058,7 @@ canon_parameters(const stp_vars_t *v, const char *name,
   }
   else if (strcmp(name, "InputSlot") == 0)
   {
-    int count = 3;
+    int count = sizeof(media_sources)/sizeof(media_sources[0]);
     description->bounds.str= stp_string_list_create();
     description->deflt.str= media_sources[0].name;
     for (i = 0; i < count; i ++)
@@ -2006,6 +2075,36 @@ canon_parameters(const stp_vars_t *v, const char *name,
       (description->bounds.str, "BW", _("Black and White"));
     description->deflt.str =
       stp_string_list_param(description->bounds.str, 0)->name;
+  } 
+  else if (strcmp(name, "Duplex") == 0)
+  {
+    int offer_duplex=0;
+
+    description->bounds.str = stp_string_list_create();
+
+/*
+ * Don't offer the Duplex/Tumble options if the JobMode parameter is
+ * set to "Page" Mode.
+ * "Page" mode is set by the Gimp Plugin, which only outputs one page at a
+ * time, so Duplex/Tumble is meaningless.
+ */
+
+    if (stp_get_string_parameter(v, "JobMode"))
+        offer_duplex = strcmp(stp_get_string_parameter(v, "JobMode"), "Page");
+    else
+     offer_duplex=1;
+
+    if (offer_duplex && (caps->features & CANON_CAP_DUPLEX))
+    {
+      description->deflt.str = duplex_types[0].name;
+      for (i=0; i < NUM_DUPLEX; i++)
+        {
+          stp_string_list_add_string(description->bounds.str,
+				     duplex_types[i].name,_(duplex_types[i].text));
+        }
+    }
+    else
+      description->is_active = 0;
   }
 }
 
@@ -2136,6 +2235,20 @@ canon_init_resetPrinter(const stp_vars_t *v, canon_init_t *init)
   canon_cmd(v,ESC5b,0x4b, 2, 0x00,0x0f);
 }
 
+/* ESC ($ -- 0x24 -- cmdSetDuplex --:
+ */
+static void
+canon_init_setDuplex(const stp_vars_t *v, canon_init_t *init)
+{
+  if (!(init->caps->features & CANON_CAP_DUPLEX))
+    return;
+  if (strncmp(init->duplex_str, "Duplex", 6)) 
+    return;
+  /* The same command seems to be needed for both Duplex and DuplexTumble
+     no idea about the meanings of the single bytes */
+  canon_cmd(v,ESC28,0x24,9,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x02);
+}
+
 /* ESC (a -- 0x61 -- cmdSetPageMode --:
  */
 static void
@@ -2165,13 +2278,13 @@ static void
 canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
 {
   unsigned char
-    arg_63_1, arg_63_2, arg_63_3;
-
+    numargs, arg_63[6];
 
   if (!(init->caps->features & CANON_CAP_c))
     return;
 
-  arg_63_1 = init->caps->model_id << 4;						/* MODEL_ID */
+  numargs = 3;
+  arg_63[0] = init->caps->model_id << 4; /* MODEL_ID */
 
   switch ( init->caps->model_id ) {
 
@@ -2180,12 +2293,12 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
 
   	case 1:			/* 360 dpi series - BJC-4000, BJC-210, BJC-70 and their descendants */
 		if (!init->printing_color)
-    			arg_63_1|= 0x01;					/* PRINT_COLOUR */
+                            arg_63[0]|= 0x01;                                        /* PRINT_COLOUR */
 
-  		arg_63_2 = ((init->pt ? init->pt->media_code : 0) << 4)		/* PRINT_MEDIA */
+                  arg_63[1] = ((init->pt ? init->pt->media_code : 0) << 4)                /* PRINT_MEDIA */
 			+ 1;	/* hardcode to High quality for now */		/* PRINT_QUALITY */
 
-  		canon_cmd(v,ESC28,0x63, 2, arg_63_1, arg_63_2);
+                  canon_cmd(v,ESC28,0x63, 2, arg_63[0], arg_63[1]);
 		break;
 
 	case 2:			/* are any models using this? */
@@ -2193,13 +2306,32 @@ canon_init_setColor(const stp_vars_t *v, canon_init_t *init)
 
 	case 3:			/* 720 dpi series - BJC-3000 and descendants */
 		if (!init->printing_color)
-    			arg_63_1|= 0x01;					/* colour mode */
-
-  		arg_63_2 = (init->pt) ? init->pt->media_code : 0;		/* print media type */
-
-		arg_63_3 = 2;	/* hardcode to whatever this means for now */	/* quality, apparently */
-
-  		canon_cmd(v,ESC28,0x63, 3, arg_63_1, arg_63_2, arg_63_3);
+                            arg_63[0]|= 0x01;                                        /* colour mode */
+
+                  arg_63[1] = (init->pt) ? init->pt->media_code : 0;                /* print media type */
+
+                 if (init->caps->model == 4202) /* S200 */
+                   {
+                     if ((init->xdpi == 720) && (init->ydpi == 720 ))
+                       arg_63[2] = 1;
+                     else
+                       arg_63[2] = 4; /* hardcoded: quality 3  (may be 0...4) */
+                     /* bidirectional is controlled via quality: 0..2 is bidi, 3 and 4 uni */
+                     /* not every combination works, no idea about the principle */
+                     if ( (init->xdpi > 360) || (init->ydpi > 360) )
+                       {
+                         numargs = 6;
+                         arg_63[3] = 0x10; arg_63[4] = 6; arg_63[5] = 8; /* arg5 makes a vert. offset for K */
+                         if (!init->printing_color)
+                           arg_63[4] = 1;
+                       }
+                   }
+                 else
+                   arg_63[2] = 2;        /* hardcode to whatever this means for now; quality, apparently */
+
+                 stp_zprintf(v, "\033\050\143");
+                 stp_put16_le(numargs, v);
+                 stp_zfwrite((const char *)arg_63, numargs, 1, v);
 		break;
   	}
 
@@ -2214,10 +2346,20 @@ canon_init_setResolution(const stp_vars_t *v, canon_init_t *init)
   if (!(init->caps->features & CANON_CAP_d))
     return;
 
+   if (init->caps->model != 4202 || (init->xdpi <= 360))
   canon_cmd(v,ESC28,0x64, 4,
 	    (init->ydpi >> 8 ), (init->ydpi & 255),
 	    (init->xdpi >> 8 ), (init->xdpi & 255));
-}
+   else
+     if (init->xdpi < 2880)
+       canon_cmd(v,ESC28,0x64, 4,
+         (720 >> 8), (720 & 255),
+         (720 >> 8), (720 & 255));
+     else
+       canon_cmd(v,ESC28,0x64, 4,
+         (720 >> 8), (720 & 255),
+         (2880 >> 8), (2880 & 255));
+  }
 
 /* ESC (g -- 0x67 -- cmdSetPageMargins --:
  */
@@ -2266,8 +2408,12 @@ canon_init_setTray(const stp_vars_t *v, canon_init_t *init)
   arg_6c_1|= (source & 0x0f);
 
   if (init->pt) arg_6c_2= init->pt->media_code;
-
-  canon_cmd(v,ESC28,0x6c, 2, arg_6c_1, arg_6c_2);
+  if (!strcmp("CD",init->source_str)) {
+    stp_deprintf(STP_DBG_CANON,"canon: sending special cd setTray command\n");
+    canon_cmd(v,ESC28,0x6c, 3, 0x3a,0x12,0);
+  } else {
+    canon_cmd(v,ESC28,0x6c, 2, arg_6c_1, arg_6c_2);
+  }
 }
 
 /* ESC (m -- 0x6d --  -- :
@@ -2278,7 +2424,8 @@ canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
   unsigned char
     arg_6d_1 = 0x03, /* color printhead? */
     arg_6d_2 = 0x00, /* 00=color  02=b/w */
-    arg_6d_3 = 0x00, /* only 01 for bjc8200 */
+    arg_6d_3 = 0x00, /* only 01 for bjc8200 and S200*/
+                     /* S200:for envelope and t-shirt transfer = 03 */
     arg_6d_a = 0x03, /* A4 paper */
     arg_6d_b = 0x00;
 
@@ -2298,7 +2445,7 @@ canon_init_setPrintMode(const stp_vars_t *v, canon_init_t *init)
   if (!init->printing_color)
     arg_6d_2= 0x02;
 
-  if (init->caps->model==8200)
+  if (init->caps->model==8200 || init->caps->model==4202)
     arg_6d_3= 0x01;
 
   canon_cmd(v,ESC28,0x6d,12, arg_6d_1,
@@ -2326,10 +2473,15 @@ canon_init_setPageMargins2(const stp_vars_t *v, canon_init_t *init)
 
   if (!(init->caps->features & CANON_CAP_p))
     return;
-
-  canon_cmd(v,ESC28,0x70, 8,
-	    arg_70_1, arg_70_2, 0x00, 0x00,
-	    arg_70_3, arg_70_4, 0x00, 0x00);
+  if (!strcmp(init->source_str,"CD")) {
+    canon_cmd(v,ESC28,0x70, 8, 0x00, 0x2a, 0xb0, 0x00,
+		               0x00, 0x01, 0xe0, 0x00);
+    stp_deprintf(STP_DBG_CANON,"sending cd margins\n");
+  } else {
+    canon_cmd(v,ESC28,0x70, 8,
+   	      arg_70_1, arg_70_2, 0x00, 0x00,
+	      arg_70_3, arg_70_4, 0x00, 0x00);
+  }
 }
 
 /* ESC (q -- 0x71 -- setPageID -- :
@@ -2348,10 +2500,24 @@ canon_init_setPageID(const stp_vars_t *v, canon_init_t *init)
 static void
 canon_init_setX72(const stp_vars_t *v, canon_init_t *init)
 {
-  if (!(init->caps->features & CANON_CAP_r))
+  if ( !( (init->caps->features & CANON_CAP_r)
+         || (init->caps->features & CANON_CAP_rr) ) )
     return;
 
-  canon_cmd(v,ESC28,0x72, 1, 0x61); /* whatever for - 8200 needs it */
+  if ( (init->caps->features & CANON_CAP_r)
+       || (init->caps->features & CANON_CAP_rr) )
+      canon_cmd(v,ESC28,0x72, 1, 0x61); /* whatever for - 8200/S200 need it */
+  if (init->caps->features & CANON_CAP_rr)
+      canon_cmd(v,ESC28,0x72, 3, 0x63, 1, 0); /* whatever for - S200 needs it */
+      /* probably to set the print direction of the head */
+}
+
+/* ESC (r -- 0x72 -- ??? set direction ??? -- :
+   only works if quality = 01  (S200) */
+static void
+canon_set_X72(const stp_vars_t *v, int x72arg)
+{
+  canon_cmd(v,ESC28,0x72, 3, 0x63, x72arg, 0);
 }
 
 /* ESC (t -- 0x74 -- cmdSetImage --:
@@ -2366,7 +2532,15 @@ canon_init_setImage(const stp_vars_t *v, canon_init_t *init)
 
   if (!(init->caps->features & CANON_CAP_t))
     return;
-
+  if (init->caps->model==4202) /* 1 bit per pixel (arg 4,7,10,13); */
+                               /* 2 level per pixel (arg 6,9,12,15) for each color */
+                               /* though we print only 1bit/pixel - but this is how */
+                               /* the windows driver works */
+  {
+    canon_cmd(v,ESC28,0x74, 30, 0x80, 4, 1, 1, 0, 2, 1, 0, 2, 1, 0, 2, 1, 0, 2,\
+              0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    return;
+  }
   if(init->caps->features & CANON_CAP_extended_t)
   {
     unsigned char buf[30] = {0x80,0x80,0x1,};
@@ -2412,8 +2586,10 @@ canon_init_printer(const stp_vars_t *v, canon_init_t *init)
 {
   int mytop;
   /* init printer */
-
-  canon_init_resetPrinter(v,init);       /* ESC [K */
+  if (init->is_first_page) {
+    canon_init_resetPrinter(v,init);       /* ESC [K */
+    canon_init_setDuplex(v,init);          /* ESC ($ */
+  }
   canon_init_setPageMode(v,init);        /* ESC (a */
   canon_init_setDataCompression(v,init); /* ESC (b */
   canon_init_setPageID(v,init);          /* ESC (q */
@@ -2555,6 +2731,57 @@ set_color_info(const canon_cap_t * caps,const canon_variable_ink_t* ink,color_in
   set_bit_info(caps,small);
 }
 
+static void
+set_mask(unsigned char *cd_mask, int x_center, int scaled_x_where,
+         int limit, int expansion, int invert)
+{
+  int clear_val = invert ? 255 : 0;
+  int set_val = invert ? 0 : 255;
+  int bytesize = 8 / expansion;
+  int byteextra = bytesize - 1;
+  int first_x_on = x_center - scaled_x_where;
+  int first_x_off = x_center + scaled_x_where;
+  if (first_x_on < 0)
+    first_x_on = 0;
+  if (first_x_on > limit)
+    first_x_on = limit;
+  if (first_x_off < 0)
+    first_x_off = 0;
+  if (first_x_off > limit)
+    first_x_off = limit;
+  first_x_on += byteextra;
+  if (first_x_off > (first_x_on - byteextra))
+    {
+      int first_x_on_byte = first_x_on / bytesize;
+      int first_x_on_mod = expansion * (byteextra - (first_x_on % bytesize));
+      int first_x_on_extra = ((1 << first_x_on_mod) - 1) ^ clear_val;
+      int first_x_off_byte = first_x_off / bytesize;
+      int first_x_off_mod = expansion * (byteextra - (first_x_off % bytesize));
+      int first_x_off_extra = ((1 << 8) - (1 << first_x_off_mod)) ^ clear_val;
+      if (first_x_off_byte < first_x_on_byte)
+        {
+          /* This can happen, if 6 or fewer points are turned on */
+          cd_mask[first_x_on_byte] = first_x_on_extra & first_x_off_extra;
+        }
+      else
+        {
+          if (first_x_on_extra != clear_val)
+
+            cd_mask[first_x_on_byte - 1] = first_x_on_extra;
+          if (first_x_off_byte > first_x_on_byte)
+            memset(cd_mask + first_x_on_byte, set_val,
+                   first_x_off_byte - first_x_on_byte);
+          if (first_x_off_extra != clear_val)
+            cd_mask[first_x_off_byte] = first_x_off_extra;
+        }
+    }
+}
+
+
+#define CD_X_OFFSET 0
+#define CD_Y_OFFSET 230
+#define CD_OUTER_RADIUS (329/2)
+#define CD_INNER_RADIUS 56
 /*
  * 'canon_print()' - Print an image to a CANON printer.
  */
@@ -2567,6 +2794,9 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   const char	*resolution = stp_get_string_parameter(v, "Resolution");
   const char	*media_source = stp_get_string_parameter(v, "InputSlot");
   const char    *print_mode = stp_get_string_parameter(v, "PrintingMode");
+  const char    *duplex_mode =stp_get_string_parameter(v, "Duplex");
+  int           page_number = stp_get_int_parameter(v, "PageNumber");
+
   int printing_color = 0;
   const char	*ink_type = stp_get_string_parameter(v, "InkType");
   int		top = stp_get_top(v);
@@ -2598,7 +2828,12 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
                 image_width;
   int           res_code;
   int           use_6color= 0;
+  int           print_cd= (media_source && (!strcmp(media_source, "CD")));
   double        k_upper, k_lower;
+  unsigned char *cd_mask = NULL;
+  double outer_r_sq = 0;
+  double inner_r_sq = 0;
+
   stp_curve_t *lum_adjustment = NULL;
   stp_curve_t *hue_adjustment = NULL;
   stp_curve_t *sat_adjustment = NULL;
@@ -2677,16 +2912,25 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
 
   internal_imageable_area(v, 0, &page_left, &page_right,
 			  &page_bottom, &page_top);
-  left -= page_left;
-  top -= page_top;
-  page_width = page_right - page_left;
-  page_height = page_bottom - page_top;
-
+  if (print_cd) {
+    left += CD_X_OFFSET; 
+    top += CD_Y_OFFSET;
+    /*page_width = CD_OUTER_RADIUS*2;
+      page_height = CD_OUTER_RADIUS*2; */
+    stp_default_media_size(v, &page_width, &page_height); 
+    out_width = page_width;
+    out_height = page_height;
+  } else {
+    left -= page_left;
+    top -= page_top;
+    page_width = page_right - page_left;
+    page_height = page_bottom - page_top;
+  }
   image_height = stp_image_height(image);
   image_width = stp_image_width(image);
 
   stp_default_media_size(v, &n, &page_true_height);
-
+  
   PUT("top        ",top,72);
   PUT("left       ",left,72);
   PUT("page_true_height",page_true_height,72);
@@ -2704,6 +2948,8 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   init.print_head = printhead;
   init.colormode = colormode;
   init.source_str = media_source;
+  init.duplex_str = duplex_mode;
+  init.is_first_page = (page_number == 0);
   init.xdpi = xdpi;
   init.ydpi = ydpi;
   init.page_width = page_width;
@@ -2752,7 +2998,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   for (i = 0; i < 7; i++)
     privdata.cols[i] = NULL;
 
-  if(xdpi==1440){
+  if((xdpi == 1440) && (model != 4202)){
     privdata.delay[0] = 0;
     privdata.delay[1] = 112;
     privdata.delay[2] = 224;
@@ -2762,6 +3008,16 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     privdata.delay[6] = 336;
     privdata.delay_max = 336;
     stp_deprintf(STP_DBG_CANON,"canon: delay on!\n");
+  } else if (model ==4202 ){
+    privdata.delay[0]= 0;
+    privdata.delay[1]= 0x30;
+    privdata.delay[2]= 0x50;
+    privdata.delay[3]= 0x70;
+    privdata.delay[4]= 0;
+    privdata.delay[5]= 0;
+    privdata.delay[6]= 0;
+    privdata.delay_max= 0x70;
+    stp_deprintf(STP_DBG_CANON,"canon: delay for S200 on!\n");
   } else {
     for (i = 0; i < 7; i++)
       privdata.delay[i] = 0;
@@ -2788,7 +3044,8 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     }
   }
 
-  privdata.buf_length = length * max_bits;
+  /* buffer length + 1 extra byte for offset data that might get added in canon_write */
+  privdata.buf_length = length * max_bits + 1;
   privdata.length = length;
   privdata.left = left;
   privdata.bits = bits;
@@ -2922,6 +3179,91 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     (v, STP_ECOLOR_K, 0,
      get_double_param(v, "BlackDensity") * get_double_param(v, "Density"));
 
+   /* initialize weaving for S200 for resolutions > 360dpi */
+   if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+     {
+       privdata.stepper_ydpi = 720;
+       privdata.nozzle_ydpi = 360;
+       if (xdpi == 2880)
+         privdata.physical_xdpi = 2880;
+       else
+         privdata.physical_xdpi = 720;
+
+       stp_deprintf(STP_DBG_CANON,"canon: adjust leftskip: old=%d,\n", privdata.left);
+       privdata.left = (int)( (float)privdata.left * (float)privdata.physical_xdpi / (float)xdpi ); /* adjust left margin */
+       stp_deprintf(STP_DBG_CANON,"canon: adjust leftskip: new=%d,\n", privdata.left);
+
+       privdata.ncolors = 4;
+       privdata.head_offset = stp_zalloc(sizeof(int) * privdata.ncolors);
+       memset(privdata.head_offset, 0, sizeof(privdata.head_offset));
+
+       if ( colormode == COLOR_MONOCHROME )
+           privdata.nozzles = 64; /* black nozzles */
+       else
+           privdata.nozzles = 24; /* color nozzles */
+       if (colormode == COLOR_MONOCHROME)
+         {
+           privdata.ncolors = 1;
+           privdata.head_offset[0] = 0; /* K starts at 0 */
+           privdata.head_offset[1] = 0 ;/* how far C starts after K */
+           privdata.head_offset[2] = 0;/* how far M starts after K */
+           privdata.head_offset[3] = 0;/* how far Y starts after K */
+           top += 11;
+         }
+       else if (colormode == COLOR_CMYK)
+         {
+           privdata.head_offset[0] = 0; /* K starts at 0 */
+           privdata.head_offset[1] = 144 ;/* how far C starts after K */
+           privdata.head_offset[2] = 144 + 64;/* how far M starts after K */
+           privdata.head_offset[3] = 144 + 64 + 64;/* how far Y starts after K */
+           top += 5;
+         }
+       else  /* colormode == CMY */
+         {
+           privdata.head_offset[0] = 0; /* K starts at 0 */
+           privdata.head_offset[1] = 0 ;/* how far C starts after K */
+           privdata.head_offset[2] = 64;/* how far M starts after K */
+           privdata.head_offset[3] = 128;/* how far Y starts after K */
+           top += 18;
+         }
+
+       privdata.nozzle_separation = privdata.stepper_ydpi / privdata.nozzle_ydpi;
+       privdata.horizontal_passes = xdpi / privdata.physical_xdpi;
+       privdata.vertical_passes = 1;
+       privdata.vertical_oversample = privdata.ydpi / privdata.stepper_ydpi;
+       privdata.bidirectional = 1; /* 1: bidirectional; 0: unidirectional  printing */
+       privdata.direction = 1;
+       stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
+       stp_deprintf(STP_DBG_CANON,"canon: initializing weaving: nozzles=%d, nozzle_separation=%d,\n"
+                                    "horizontal_passes=%d, vertical_passes=%d,vertical_oversample=%d,\n"
+                                    "ncolors=%d, out_width=%d, out_height=%d\n"
+                                    "weave_top=%d, weave_page_height=%d \n"
+                                    "head_offset=[%d,%d,%d,%d]  \n",
+                                    privdata.nozzles, privdata.nozzle_separation,
+                                    privdata.horizontal_passes, privdata.vertical_passes,
+                                    privdata.vertical_oversample, privdata.ncolors,
+                                    out_width, out_height,
+                                    top * privdata.stepper_ydpi / 72, page_height * privdata.stepper_ydpi / 72,
+                                    privdata.head_offset[0],privdata.head_offset[1],
+                                    privdata.head_offset[2],privdata.head_offset[3]);
+
+       stp_initialize_weave(v, privdata.nozzles, privdata.nozzle_separation,
+                                privdata.horizontal_passes, privdata.vertical_passes,
+                                privdata.vertical_oversample, privdata.ncolors,
+                                1,
+                                out_width, out_height,
+                                top * privdata.stepper_ydpi / 72,
+                                page_height * privdata.stepper_ydpi / 72,
+                                privdata.head_offset,
+                                STP_WEAVE_ZIGZAG,
+                                canon_flush_pass,
+                                stp_fill_uncompressed,
+                                stp_pack_uncompressed,
+                                stp_compute_uncompressed_linewidth);
+       privdata.last_pass_offset = 0;
+     }
+
+
   errdiv  = image_height / out_height;
   errmod  = image_height % out_height;
   errval  = 0;
@@ -2960,6 +3302,11 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   stp_allocate_component_data(v, "Driver", NULL, NULL, &privdata);
 
   privdata.emptylines = 0;
+  if (print_cd) {
+    cd_mask = stp_malloc(1 + (out_width + 7) / 8);
+    outer_r_sq = (double)CD_OUTER_RADIUS * (double)CD_OUTER_RADIUS;
+    inner_r_sq = (double)CD_INNER_RADIUS * (double)CD_INNER_RADIUS;
+  }
   for (y = 0; y < out_height; y ++)
   {
     int duplicate_line = 1;
@@ -2974,9 +3321,36 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
 	  break;
 	}
     }
-
-    stp_dither(v, y, duplicate_line, zero_mask, NULL);
-    canon_printfunc(v);
+    if (print_cd) 
+      {
+	int x_center = CD_OUTER_RADIUS * xdpi / 72;
+	int y_distance_from_center =
+	  CD_OUTER_RADIUS - (y * 72 / ydpi);
+	if (y_distance_from_center < 0)
+	  y_distance_from_center = -y_distance_from_center;
+	memset(cd_mask, 0, (out_width + 7) / 8);
+	if (y_distance_from_center < CD_OUTER_RADIUS)
+	  {
+	    double y_sq = (double) y_distance_from_center *
+	      (double) y_distance_from_center;
+	    int x_where = sqrt(outer_r_sq - y_sq) + .5;
+	    int scaled_x_where = x_where * xdpi / 72;
+	    set_mask(cd_mask, x_center, scaled_x_where,
+		     out_width, 1, 0);
+	    if (y_distance_from_center < CD_INNER_RADIUS)
+	      {
+		x_where = sqrt(inner_r_sq - y_sq) + .5;
+		scaled_x_where = x_where * ydpi / 72;
+		set_mask(cd_mask, x_center, scaled_x_where,
+			 out_width, 1, 1);
+	      }
+	  }
+      }
+    stp_dither(v, y, duplicate_line, zero_mask, cd_mask);
+    if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+        stp_write_weave(v, privdata.cols);
+    else
+        canon_printfunc(v);
     errval += errmod;
     errline += errdiv;
     if (errval >= out_height)
@@ -2986,6 +3360,14 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
     }
   }
 
+  if ( (init.caps->features & CANON_CAP_WEAVE) && (xdpi > 360) )
+  {
+      stp_flush_all(v);
+      canon_advance_paper(v, 5);
+  }
+  else
+  {
+
   /*
    * Flush delayed buffers...
    */
@@ -3001,7 +3383,7 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
 			     privdata.delay[i]);
     }
   }
-
+  }
   stp_image_conclude(image);
 
  /*
@@ -3011,6 +3393,9 @@ canon_do_print(stp_vars_t *v, stp_image_t *image)
   for (i = 0; i < 7; i++)
     if (privdata.cols[i])
       stp_free(privdata.cols[i]);
+  
+  if(cd_mask)
+      stp_free(cd_mask);
 
   canon_deinit_printer(v, &init);
   return status;
@@ -3247,22 +3632,31 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
   if (line[0] == 0 && memcmp(line, line + 1, length - 1) == 0)
     return 0;
 
+  offset2 = offset / 8;
+  bitoffset = offset % 8;
+
   /* fold lsb/msb pairs if drop modulation is active */
 
 
 
   if (bits==2) {
+    int pixels_per_byte = 4;
+    if((caps->features & CANON_CAP_5pixelin1byte) && (pd->color_info[coloridx].level == 3))
+      pixels_per_byte = 5;
     stp_fold(line,length,in_fold);
     in_ptr= in_fold;
     length= (length*8/4); /* 4 pixels in 8bit */
-    offset= (offset*8/4); /* 4 pixels in 8bit  */
+    /* calculate the number of compressed bytes that can be sent directly */
+    offset2 = offset / pixels_per_byte;
+    /* calculate the number of (uncompressed) bits that have to be added to the raster data */
+    bitoffset = (offset % pixels_per_byte) * 2;
   }
   if (bits==3) {
     memset(in_fold,0,length);
     canon_fold_3bit(line,length,in_fold);
     in_ptr= in_fold;
     length= (length*8)/3;
-    offset= (offset/3)*8;
+    offset2 = offset/3;
 #if 0
     switch(offset%3){
     case 0: offset= (offset/3)*8;   break;
@@ -3270,12 +3664,11 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
     case 2: offset= (offset/3)*8/*+5 CAREFUL! CANNOT SHIFT _AFTER_ RECODING!!*/; break;
     }
 #endif
+    bitoffset= 0;
   }
   /* pack left border rounded to multiples of 8 dots */
 
   comp_data= comp_buf;
-  offset2= offset/8;
-  bitoffset= offset%8;
   while (offset2>0) {
     unsigned char toffset = offset2 > 128 ? 128 : offset2;
     comp_data[0] = 1 - toffset;
@@ -3285,7 +3678,15 @@ canon_write(stp_vars_t *v,		/* I - Print file or command */
   }
   if (bitoffset) {
     if (bitoffset<8)
-      canon_shift_buffer(in_ptr,length,bitoffset);
+    {
+       in_ptr[ length++ ] = 0;
+       canon_shift_buffer(in_ptr,length,bitoffset);
+    }
+    else if (bitoffset == 8)
+    {
+      memmove(in_ptr + 1,in_ptr,length++);
+      in_ptr[0] = 0;
+    }
     else
       stp_deprintf(STP_DBG_CANON,"SEVERE BUG IN print-canon.c::canon_write() "
 	      "bitoffset=%d!!\n",bitoffset);
@@ -3349,6 +3750,98 @@ canon_write_line(stp_vars_t *v)
     pd->emptylines += 1;
 }
 
+static void
+canon_advance_paper(stp_vars_t *v, int advance)
+{
+  if ( advance > 0 )
+    {
+      int a0, a1, a2, a3;
+      stp_deprintf(STP_DBG_CANON,"                      --advance paper %d\n", advance);
+      a0 = advance         & 0xff;
+      a1 = (advance >> 8)  & 0xff;
+      a2 = (advance >> 16) & 0xff;
+      a3 = (advance >> 24) & 0xff;
+      stp_zprintf(v, "\033(e%c%c%c%c%c%c", 4, 0, a3, a2, a1, a0);
+    }
+}
+
+static void
+canon_flush_pass(stp_vars_t *v, int passno, int vertical_subpass)
+{
+  stp_lineoff_t        *lineoffs   = stp_get_lineoffsets_by_pass(v, passno);
+  stp_lineactive_t     *lineactive = stp_get_lineactive_by_pass(v, passno);
+  const stp_linebufs_t *bufs       = stp_get_linebases_by_pass(v, passno);
+  stp_pass_t           *pass       = stp_get_pass_by_pass(v, passno);
+  stp_linecount_t      *linecount  = stp_get_linecount_by_pass(v, passno);
+  canon_privdata_t      *pd         = (canon_privdata_t *) stp_get_component_data(v, "Driver");
+  int                    papershift = (pass->logicalpassstart - pd->last_pass_offset);
+
+  int color, line, written = 0, linelength = 0, lines = 0;
+  int idx[4]={3, 0, 1, 2}; /* color numbering is different between canon_write and weaving */
+
+  stp_deprintf(STP_DBG_CANON,"canon_flush_pass: ----pass=%d,---- \n", passno);
+  (pd->emptylines) = 0;
+
+  for ( color = 0; color < pd->ncolors; color++ ) /* find max. linecount */
+    {
+      if ( linecount[0].v[color] > lines )
+        lines = linecount[0].v[color];
+    }
+
+  for ( line = 0; line < lines; line++ )  /* go through each nozzle f that pass */
+    {
+      stp_deprintf(STP_DBG_CANON,"                      --line=%d\n", line);
+
+      if ( written > 0 )
+        canon_cmd(v,ESC28,0x65, 2, 0, 1); /* go to next nozzle*/
+                                           /* if there was printed some data */
+
+      written = 0;
+      for ( color = 0; color < pd->ncolors; color++ )
+        {
+          if ( line < linecount[0].v[color] )  /* try only existing lines */
+            {
+              if ( lineactive[0].v[color] > 0 )
+                {
+                  linelength = lineoffs[0].v[color] / linecount[0].v[color];
+/*                stp_deprintf(STP_DBG_CANON,"canon_flush_pass: linelength=%d, bufs[0].v[color]=%p,"
+                  "bufs[0].v[color]+line * linelength=%p, empty=%d \n", linelength, bufs[0].v[color],
+                   bufs[0].v[color] + line * linelength, (pd->emptylines));
+*/
+                  if ( pass->logicalpassstart - pd->last_pass_offset > 0 )
+                    {
+                      canon_advance_paper(v, papershift);
+                      pd->last_pass_offset = pass->logicalpassstart;
+                      if (pd->bidirectional)
+                        {
+                         pd->direction = (pd->direction +1) & 1;
+                         canon_set_X72(v, pd->direction);
+                         stp_deprintf(STP_DBG_CANON,"                      --set direction %d\n", pd->direction);
+                        }
+                    }
+
+                  written += canon_write(v, pd->caps,
+                               (unsigned char *)(bufs[0].v[color] + line * linelength),
+                               linelength, idx[color], pd->ydpi,
+                               &(pd->emptylines), pd->out_width,
+                               pd->left, pd->bits);
+                  if (written) stp_deprintf(STP_DBG_CANON,"                        --written color %d,\n", color);
+
+                }
+            }
+        }
+
+      if ( written == 0 ) /* count unused nozzles */
+        (pd->emptylines) += 1;
+    }
+
+  for ( color = 0; color < pd->ncolors; color++ )
+    {
+      lineoffs[0].v[color] = 0;
+      linecount[0].v[color] = 0;
+    }
+  stp_deprintf(STP_DBG_CANON,"                  --ended-- with empty=%d \n", (pd->emptylines));
+}
 
 static stp_family_t print_canon_module_data =
   {
diff --git a/src/main/print-color.c b/src/main/print-color.c
index b6ebb71..c7c6574 100644
--- a/src/main/print-color.c
+++ b/src/main/print-color.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-color.c,v 1.131 2005/07/04 00:23:54 rlk Exp $"
+ * "$Id: print-color.c,v 1.132 2005/09/17 21:54:33 rlk Exp $"
  *
  *   Gutenprint color management module - traditional Gutenprint algorithm.
  *
@@ -156,6 +156,7 @@ typedef struct
   double defval;
   unsigned channel_mask;
   int color_only;
+  int is_rgb;
 } float_param_t;
 
 #define RAW_GAMMA_CHANNEL(channel)					 \
@@ -165,7 +166,7 @@ typedef struct
       N_("Gamma for raw channel " #channel),				 \
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,		 \
       STP_PARAMETER_LEVEL_INTERNAL, 0, 1, channel, 1, 0			 \
-    }, 0.1, 4.0, 1.0, CMASK_RAW, 0					 \
+    }, 0.1, 4.0, 1.0, CMASK_RAW, 0, -1					 \
   }
 
 static const float_param_t float_parameters[] =
@@ -176,7 +177,7 @@ static const float_param_t float_parameters[] =
       N_("Color correction to be applied"),
       STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED, 1, 1, -1, 1, 0
-    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -184,7 +185,7 @@ static const float_param_t float_parameters[] =
       N_("Bit depth per channel"),
       STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
       STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
-    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -192,7 +193,7 @@ static const float_param_t float_parameters[] =
       N_("Input image type"),
       STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
       STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
-    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -200,7 +201,7 @@ static const float_param_t float_parameters[] =
       N_("Output image type"),
       STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_CORE,
       STP_PARAMETER_LEVEL_INTERNAL, 1, 1, -1, 1, 0
-    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0
+    }, 0.0, 0.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -208,7 +209,15 @@ static const float_param_t float_parameters[] =
       N_("Raw Channels"),
       STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_CORE,
       STP_PARAMETER_LEVEL_INTERNAL, 1, 1, -1, 1, 0
-    }, 1.0, STP_CHANNEL_LIMIT, 1.0, CMASK_EVERY, 0
+    }, 1.0, STP_CHANNEL_LIMIT, 1.0, CMASK_EVERY, 0, -1
+  },
+  {
+    {
+      "SimpleGamma", N_("SimpleGamma"), N_("Gamma"),
+      N_("Do not correct for screen gamma"),
+      STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0
+    }, 0.0, 1.0, 0.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -216,7 +225,7 @@ static const float_param_t float_parameters[] =
       N_("Brightness of the print"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
-    }, 0.0, 2.0, 1.0, CMASK_ALL, 0
+    }, 0.0, 2.0, 1.0, CMASK_ALL, 0, -1
   },
   {
     {
@@ -224,7 +233,7 @@ static const float_param_t float_parameters[] =
       N_("Contrast of the print (0 is solid gray)"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_ALL, 0
+    }, 0.0, 4.0, 1.0, CMASK_ALL, 0, -1
   },
   {
     {
@@ -232,7 +241,7 @@ static const float_param_t float_parameters[] =
       N_("Use linear vs. fixed end point contrast adjustment"),
       STP_PARAMETER_TYPE_BOOLEAN, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED3, 1, 1, -1, 1, 0
-    }, 0.0, 0.0, 0.0, CMASK_ALL, 0
+    }, 0.0, 0.0, 0.0, CMASK_ALL, 0, -1
   },
   {
     {
@@ -242,7 +251,7 @@ static const float_param_t float_parameters[] =
 	 "values will produce a generally darker print. "),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, -1, 1, 0
-    }, 0.1, 4.0, 1.0, CMASK_EVERY, 0
+    }, 0.1, 4.0, 1.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -250,7 +259,7 @@ static const float_param_t float_parameters[] =
       N_("Gamma value assumed by application"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_INTERNAL, 0, 1, -1, 1, 0
-    }, 0.1, 4.0, 1.0, CMASK_EVERY, 0
+    }, 0.1, 4.0, 1.0, CMASK_EVERY, 0, -1
   },
   {
     {
@@ -258,7 +267,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the cyan gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_C, 1
+    }, 0.0, 4.0, 1.0, CMASK_C, 1, 0
   },
   {
     {
@@ -266,7 +275,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the magenta gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_M, 1
+    }, 0.0, 4.0, 1.0, CMASK_M, 1, 0
   },
   {
     {
@@ -274,7 +283,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the yellow gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_Y, 1
+    }, 0.0, 4.0, 1.0, CMASK_Y, 1, 0
   },
   {
     {
@@ -282,7 +291,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the red gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
-    }, 0.0, 1.0, 1.0, CMASK_R, 1
+    }, 0.0, 4.0, 1.0, CMASK_C, 1, 1
   },
   {
     {
@@ -290,7 +299,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the green gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_G, 1
+    }, 0.0, 4.0, 1.0, CMASK_M, 1, 1
   },
   {
     {
@@ -298,7 +307,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the blue gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_B, 1
+    }, 0.0, 4.0, 1.0, CMASK_Y, 1, 1
   },
   {
     {
@@ -306,7 +315,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the black gamma"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
-    }, 0.0, 4.0, 1.0, CMASK_K, 1
+    }, 0.0, 4.0, 1.0, CMASK_K, 1, 0
   },
   {
     {
@@ -314,7 +323,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the cyan gray balance"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 1, 1, 0
-    }, 0.0, 1.0, 1.0, CMASK_C, 1
+    }, 0.0, 1.0, 1.0, CMASK_C, 1, 0
   },
   {
     {
@@ -322,7 +331,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the magenta gray balance"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 2, 1, 0
-    }, 0.0, 1.0, 1.0, CMASK_M, 1
+    }, 0.0, 1.0, 1.0, CMASK_M, 1, 0
   },
   {
     {
@@ -330,7 +339,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the yellow gray balance"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED1, 0, 1, 3, 1, 0
-    }, 0.0, 1.0, 1.0, CMASK_Y, 1
+    }, 0.0, 1.0, 1.0, CMASK_Y, 1, 0
   },
   {
     {
@@ -340,7 +349,7 @@ static const float_param_t float_parameters[] =
 	 "using color and black inks"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_BASIC, 1, 1, -1, 1, 0
-    }, 0.0, 9.0, 1.0, CMASK_CMY | CMASK_RGB, 1
+    }, 0.0, 9.0, 1.0, CMASK_CMY | CMASK_RGB, 1, 0
   },
   /* Need to think this through a bit more -- rlk 20030712 */
   {
@@ -349,7 +358,7 @@ static const float_param_t float_parameters[] =
       N_("Limit the total ink printed to the page"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 0, 0
-    }, 0.0, STP_CHANNEL_LIMIT, STP_CHANNEL_LIMIT, CMASK_CMY, 0
+    }, 0.0, STP_CHANNEL_LIMIT, STP_CHANNEL_LIMIT, CMASK_CMY, 0, -1
   },
   {
     {
@@ -357,7 +366,7 @@ static const float_param_t float_parameters[] =
       N_("Adjust the gray component transition rate"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
-    }, 0.0, 1.0, 1.0, CMASK_K, 1
+    }, 0.0, 1.0, 1.0, CMASK_K, 1, 0
   },
   {
     {
@@ -365,7 +374,7 @@ static const float_param_t float_parameters[] =
       N_("Lower bound of gray component reduction"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
-    }, 0.0, 1.0, 0.2, CMASK_K, 1
+    }, 0.0, 1.0, 0.2, CMASK_K, 1, 0
   },
   {
     {
@@ -373,7 +382,7 @@ static const float_param_t float_parameters[] =
       N_("Upper bound of gray component reduction"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, 0, 1, 0
-    }, 0.0, 5.0, 0.5, CMASK_K, 1
+    }, 0.0, 5.0, 0.5, CMASK_K, 1, 0
   },
   RAW_GAMMA_CHANNEL(0),
   RAW_GAMMA_CHANNEL(1),
@@ -419,6 +428,7 @@ typedef struct
   unsigned channel_mask;
   int hsl_only;
   int color_only;
+  int is_rgb;
 } curve_param_t;
 
 static int standard_curves_initialized = 0;
@@ -437,7 +447,7 @@ static stp_curve_t *gcr_curve_bounds = NULL;
       N_("Output Curves"), N_("Curve for raw channel " #channel),	\
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,		\
       STP_PARAMETER_LEVEL_INTERNAL, 0, 1, channel, 1, 0			\
-    }, &color_curve_bounds, CMASK_RAW, 0, 0				\
+    }, &color_curve_bounds, CMASK_RAW, 0, 0, -1				\
   }
 
 static curve_param_t curve_parameters[] =
@@ -448,7 +458,7 @@ static curve_param_t curve_parameters[] =
       N_("Cyan curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
-    }, &color_curve_bounds, CMASK_C, 0, 1
+    }, &color_curve_bounds, CMASK_C, 0, 1, 0
   },
   {
     {
@@ -456,7 +466,7 @@ static curve_param_t curve_parameters[] =
       N_("Magenta curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 2, 1, 0
-    }, &color_curve_bounds, CMASK_M, 0, 1
+    }, &color_curve_bounds, CMASK_M, 0, 1, 0
   },
   {
     {
@@ -464,7 +474,7 @@ static curve_param_t curve_parameters[] =
       N_("Yellow curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 3, 1, 0
-    }, &color_curve_bounds, CMASK_Y, 0, 1
+    }, &color_curve_bounds, CMASK_Y, 0, 1, 0
   },
   {
     {
@@ -472,7 +482,7 @@ static curve_param_t curve_parameters[] =
       N_("Black curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 0, 1, 0
-    }, &color_curve_bounds, CMASK_K, 0, 0
+    }, &color_curve_bounds, CMASK_K, 0, 0, 0
   },
   {
     {
@@ -480,23 +490,23 @@ static curve_param_t curve_parameters[] =
       N_("Red curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
-    }, &color_curve_bounds, CMASK_R, 0, 1
+    }, &color_curve_bounds, CMASK_C, 0, 1, 1
   },
   {
     {
       "GreenCurve", N_("Green Curve"), N_("Output Curves"),
       N_("Green curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
-    }, &color_curve_bounds, CMASK_G, 0, 1
+      STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 2, 1, 0
+    }, &color_curve_bounds, CMASK_M, 0, 1, 1
   },
   {
     {
       "BlueCurve", N_("Blue Curve"), N_("Output Curves"),
       N_("Blue curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
-      STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
-    }, &color_curve_bounds, CMASK_B, 0, 1
+      STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 3, 1, 0
+    }, &color_curve_bounds, CMASK_Y, 0, 1, 1
   },
   {
     {
@@ -504,7 +514,7 @@ static curve_param_t curve_parameters[] =
       N_("White curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED2, 0, 1, 1, 1, 0
-    }, &color_curve_bounds, CMASK_W, 0, 0
+    }, &color_curve_bounds, CMASK_W, 0, 0, 1
   },
   {
     {
@@ -512,7 +522,7 @@ static curve_param_t curve_parameters[] =
       N_("Hue adjustment curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, -1, 1, 0
-    }, &hue_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1
+    }, &hue_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1, -1
   },
   {
     {
@@ -520,7 +530,7 @@ static curve_param_t curve_parameters[] =
       N_("Saturation adjustment curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, -1, 1, 0
-    }, &sat_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1
+    }, &sat_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1, -1
   },
   {
     {
@@ -528,7 +538,7 @@ static curve_param_t curve_parameters[] =
       N_("Luminosity adjustment curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, -1, 1, 0
-    }, &lum_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1
+    }, &lum_map_bounds, CMASK_CMY | CMASK_RGB, 1, 1, -1
   },
   {
     {
@@ -536,7 +546,7 @@ static curve_param_t curve_parameters[] =
       N_("Gray component reduction curve"),
       STP_PARAMETER_TYPE_CURVE, STP_PARAMETER_CLASS_OUTPUT,
       STP_PARAMETER_LEVEL_ADVANCED3, 0, 1, 0, 1, 0
-    }, &gcr_curve_bounds, CMASK_K, 0, 1
+    }, &gcr_curve_bounds, CMASK_K, 0, 1, -1
   },
   RAW_CURVE_CHANNEL(0),
   RAW_CURVE_CHANNEL(1),
@@ -681,6 +691,7 @@ allocate_lut(void)
   ret->app_gamma = 1.0;
   ret->contrast = 1.0;
   ret->brightness = 1.0;
+  ret->simple_gamma_correction = 0;
   return ret;
 }
 
@@ -721,6 +732,7 @@ copy_lut(void *vlut)
   dest->screen_gamma = src->screen_gamma;
   dest->contrast = src->contrast;
   dest->brightness = src->brightness;
+  dest->simple_gamma_correction = src->simple_gamma_correction;
   dest->linear_contrast_adjustment = src->linear_contrast_adjustment;
   stp_curve_cache_copy(&(dest->hue_map), &(src->hue_map));
   stp_curve_cache_copy(&(dest->lum_map), &(src->lum_map));
@@ -818,7 +830,7 @@ compute_gcr_curve(const stp_vars_t *vars)
 }
 
 static void
-initialize_gcr_curve(const stp_vars_t *vars)
+initialize_gcr_curve(stp_vars_t *vars)
 {
   lut_t *lut = (lut_t *)(stp_get_component_data(vars, "Color"));
   stp_curve_t *curve = NULL;
@@ -840,7 +852,7 @@ initialize_gcr_curve(const stp_vars_t *vars)
     }
   else
     curve = compute_gcr_curve(vars);
-  stp_channel_set_gcr_curve((stp_vars_t *)vars, curve);
+  stp_channel_set_gcr_curve(vars, curve);
   if (curve)
     stp_curve_destroy(curve);
 }
@@ -1085,6 +1097,33 @@ compute_a_curve_fast(lut_t *lut, int channel)
   stp_free(tmp);
 }
 
+static void
+compute_a_curve_simple(lut_t *lut, int channel)
+{
+  double *tmp;
+  stp_curve_t *curve = stp_curve_cache_get_curve(&(lut->channel_curves[channel]));
+  int i;
+  int isteps = lut->steps;
+  double gamma = 1.0 / (lut->gamma_values[channel] * lut->print_gamma);
+  if (isteps > 256)
+    isteps = 256;
+  tmp = stp_malloc(sizeof(double) * lut->steps);
+  for (i = 0; i < isteps; i++)
+    {
+      double pixel = (double) i / (double) (isteps - 1);
+      if (lut->input_color_description->color_model == COLOR_BLACK)
+	pixel = 1.0 - pixel;
+      pixel = pow(pixel, gamma);
+      if (lut->output_color_description->color_model == COLOR_BLACK)
+	pixel = 1.0 - pixel;
+      tmp[i] = floor((65535.0 * pixel) + 0.5);
+    }
+  stp_curve_set_data(curve, isteps, tmp);
+  if (isteps != lut->steps)
+    stp_curve_resample(curve, lut->steps);
+  stp_free(tmp);
+}
+
 /*
  * If the input and output color spaces both have a particular channel,
  * we want to use the general algorithm.  If not (i. e. we have to
@@ -1095,6 +1134,8 @@ compute_a_curve(lut_t *lut, int channel)
 {
   if (channel_is_synthesized(lut, channel))
     compute_a_curve_fast(lut, channel);
+  else if (lut->simple_gamma_correction)
+    compute_a_curve_simple(lut, channel);
   else
     compute_a_curve_full(lut, channel);
 }
@@ -1143,7 +1184,8 @@ compute_one_lut(lut_t *lut, int i)
 			STP_CURVE_BOUNDS_RESCALE);
       if (stp_curve_is_piecewise(curve))
 	stp_curve_resample(curve, lut->steps);
-      invert_curve(curve, invert_output);
+      if (lut->invert_output)
+	invert_curve(curve, invert_output);
       stp_curve_resample(curve, lut->steps);
     }
   else
@@ -1201,6 +1243,7 @@ stpi_compute_lut(stp_vars_t *v)
   lut->app_gamma = 1.0;
   lut->contrast = 1.0;
   lut->brightness = 1.0;
+  lut->simple_gamma_correction = 0;
 
   if (stp_check_boolean_parameter(v, "LinearContrast", STP_PARAMETER_DEFAULTED))
     lut->linear_contrast_adjustment =
@@ -1214,6 +1257,8 @@ stpi_compute_lut(stp_vars_t *v)
 
   if (stp_check_float_parameter(v, "AppGamma", STP_PARAMETER_ACTIVE))
     lut->app_gamma = stp_get_float_parameter(v, "AppGamma");
+  if (stp_check_boolean_parameter(v, "SimpleGamma", STP_PARAMETER_ACTIVE))
+    lut->simple_gamma_correction = stp_get_boolean_parameter(v, "SimpleGamma");
   lut->screen_gamma = lut->app_gamma / 4.0; /* "Empirical" */
   curve = stp_curve_create_copy(color_curve_bounds);
   stp_curve_rescale(curve, 65535.0, STP_CURVE_COMPOSE_MULTIPLY,
@@ -1448,6 +1493,11 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
 		get_color_description(stp_describe_output(v));
 	      if (color_description &&
 		  (param->channel_mask & color_description->channels) &&
+		  (param->is_rgb < 0 ||
+		   (param->is_rgb == 0 &&
+		    color_description->color_model == COLOR_BLACK) ||
+		   (param->is_rgb == 1 &&
+		    color_description->color_model == COLOR_WHITE)) &&
 		  param->channel_mask != CMASK_RAW)
 		description->is_active = 1;
 	      else
@@ -1570,6 +1620,11 @@ stpi_color_traditional_describe_parameter(const stp_vars_t *v,
 	      const color_description_t *color_description =
 		get_color_description(stp_describe_output(v));
 	      if (color_description &&
+		  (param->is_rgb < 0 ||
+		   (param->is_rgb == 0 &&
+		    color_description->color_model == COLOR_BLACK) ||
+		   (param->is_rgb == 1 &&
+		    color_description->color_model == COLOR_WHITE)) &&
 		  (param->channel_mask & color_description->channels))
 		description->is_active = 1;
 	      else
diff --git a/src/main/print-dither-matrices.c b/src/main/print-dither-matrices.c
index a301fb0..b7fa06a 100644
--- a/src/main/print-dither-matrices.c
+++ b/src/main/print-dither-matrices.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-dither-matrices.c,v 1.34 2004/09/17 18:38:22 rleigh Exp $"
+ * "$Id: print-dither-matrices.c,v 1.35 2005/10/23 19:43:14 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -171,19 +171,27 @@ stp_dither_matrix_init_from_dither_array(stp_dither_matrix_impl_t *mat,
   stp_array_get_size(array, &x_size, &y_size);
 
   vec = stp_sequence_get_ushort_data(seq, &count);
-  mat->base = x_size;;
+  mat->base = x_size;
   mat->exp = 1;
-  mat->x_size = x_size;
-  mat->y_size = y_size;
+  if (transpose)
+    {
+      mat->x_size = y_size;
+      mat->y_size = x_size;
+    }
+  else
+    {
+      mat->x_size = x_size;
+      mat->y_size = y_size;
+    }
   mat->total_size = mat->x_size * mat->y_size;
   mat->matrix = stp_malloc(sizeof(unsigned) * mat->x_size * mat->y_size);
-  for (x = 0; x < mat->x_size; x++)
-    for (y = 0; y < mat->y_size; y++)
+  for (x = 0; x < x_size; x++)
+    for (y = 0; y < y_size; y++)
       {
 	if (transpose)
-	  mat->matrix[x + y * mat->x_size] = vec[y + x * mat->y_size];
+	  mat->matrix[y + x * y_size] = vec[x + y * x_size];
 	else
-	  mat->matrix[x + y * mat->x_size] = vec[x + y * mat->x_size];
+	  mat->matrix[x + y * x_size] = vec[x + y * x_size];
       }
   mat->last_x = mat->last_x_mod = 0;
   mat->last_y = mat->last_y_mod = 0;
diff --git a/src/main/print-escp2-data.c b/src/main/print-escp2-data.c
index 7d7191e..ac20bc4 100644
--- a/src/main/print-escp2-data.c
+++ b/src/main/print-escp2-data.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2-data.c,v 1.178 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: print-escp2-data.c,v 1.181 2005/10/29 21:31:19 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -81,6 +81,9 @@ static const escp2_dot_size_t c2pl_dotsizes =
 static const escp2_dot_size_t c1_8pl_dotsizes =
 { 0x10, 0x10, 0x10, 0x10, 0x11, 0x12, 0x12, 0x13, 0x13 };
 
+static const escp2_dot_size_t p3_5pl_dotsizes =
+{ 0x10, 0x10, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12 };
+
 static const escp2_dot_size_t sc440_dotsizes =
 {    3,    3,    2,    1,   -1,   -1,   -1,   -1,   -1 };
 
@@ -211,7 +214,7 @@ static const escp2_base_resolutions_t pro_base_res =
  *  8: 5760x2880
  */
 
-/*  0    1     2       3    4      5      6      7 */
+/*  0    1     2       3    4      5      6      7      8 */
 
 static const escp2_densities_t g1_densities =
 { 2.6, 1.3,  1.3,  0.568, 0.0,   0.0,   0.0,   0.0,   0.0   };
@@ -241,11 +244,14 @@ static const escp2_densities_t c3pl_densities =
 { 2.6, 1.3,  0.65, 0.730, 0.7,   0.91,  0.455, 0.0,   0.0   };
 
 static const escp2_densities_t p3pl_densities =
-{ 4.0, 2.0,  1.00, 0.815, 0.788, 0.821, 0.680, 0.340, 0.0   };
+{ 4.0, 2.0,  1.00, 0.679, 0.657, 0.684, 0.566, 0.283, 0.0   };
 
 static const escp2_densities_t p1_5pl_densities =
 { 2.8, 1.4,  1.00, 1.000, 0.869, 0.942, 0.471, 0.500, 0.530 };
 
+static const escp2_densities_t p3_5pl_densities =
+{ 2.8, 1.4,  1.77, 0.886, 0.443, 0.221, 0.240, 0.293, 0.146 };
+
 static const escp2_densities_t c2pl_densities =
 { 2.0, 1.0,  0.5,  0.650, 0.650, 0.0,   0.650, 0.325, 0.0   };
 
@@ -643,6 +649,20 @@ static const char *r800_channel_names[] =
 
 DECLARE_CHANNEL_LIST(r800);
 
+static const char *r2400_channel_names[] =
+{
+  N_("Light Light Black"),
+  N_("Light Magenta"),
+  N_("Light Cyan"),
+  N_("Light Black"),
+  N_("Black"),
+  N_("Cyan"),
+  N_("Magenta"),
+  N_("Yellow"),
+};
+
+DECLARE_CHANNEL_LIST(r2400);
+
 const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
 {
   /* FIRST GENERATION PRINTERS */
@@ -1840,6 +1860,40 @@ const stpi_escp2_printer_t stpi_escp2_model_capabilities[] =
     &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
     NULL, &standard_channel_name_list
   },
+  /* 70: Stylus Photo RX700 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    180, 1, 2, 180, 1, 2, 180, 1, 2, 6,
+    360, 14400, -1, 2880, 1440, 360, 120, 0, 1, 0, 190, 0, 0, 0,
+    INCH(17 / 2), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+    4, 15, 0, 0,
+    p3pl_dotsizes, p3pl_densities, &stpi_escp2_variable_3pl_pmg_drops,
+    stpi_escp2_superfine_reslist, &stpi_escp2_photo_gen3_inkgroup,
+    variable_bits, variable_base_res, &cd_roll_feed_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &photo_channel_name_list
+  },
+  /* 71: Stylus Photo R2400 */
+  {
+    (MODEL_VARIABLE_YES | MODEL_COMMAND_2000 | MODEL_GRAYMODE_YES |
+     MODEL_XZEROMARGIN_YES | MODEL_VACUUM_NO | MODEL_FAST_360_NO |
+     MODEL_SEND_ZERO_ADVANCE_YES | MODEL_SUPPORTS_INK_CHANGE_NO |
+     MODEL_PACKET_MODE_YES),
+    180, 1, 2, 180, 1, 2, 180, 1, 2, 8,
+    360, 14400, -1, 2880, 2880, 360, 180, 0, 1, 0, 190, 0, 0, 0,
+    INCH(13), INCH(1200), INCH(2), INCH(2),
+    9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 9, 9, 0, 0, 204, 191, 595, 842,
+    4, 15, 0, 0,
+    p3_5pl_dotsizes, p3_5pl_densities, &stpi_escp2_variable_r2400_drops,
+    stpi_escp2_superfine_reslist, &stpi_escp2_f360_ultrachrome_k3_inkgroup,
+    variable_bits, c1_5_base_res, &cd_roll_feed_input_slot_list,
+    &standard_quality_list, &new_init_sequence, &je_deinit_sequence,
+    NULL, &r2400_channel_name_list
+  },
 };
 
 const int stpi_escp2_model_limit =
diff --git a/src/main/print-escp2.c b/src/main/print-escp2.c
index 8b8344b..4c4f588 100644
--- a/src/main/print-escp2.c
+++ b/src/main/print-escp2.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.c,v 1.343 2005/08/14 14:55:22 rleigh Exp $"
+ * "$Id: print-escp2.c,v 1.345 2005/10/23 19:43:14 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -497,6 +497,14 @@ static const float_param_t float_parameters[] =
   },
   {
     {
+      "LightGrayTransition", N_("Light Gray Transition"), N_("Advanced Ink Adjustment"),
+      N_("Light Gray Transition"),
+      STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+      STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, -1, 1, 0
+    }, 0.0, 5.0, 1.0, 1
+  },
+  {
+    {
       "Gray3Transition", N_("Dark Gray Transition"), N_("Advanced Ink Adjustment"),
       N_("Dark Gray Transition"),
       STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
@@ -1240,20 +1248,6 @@ set_hue_map_parameter(const stp_vars_t *v,
 }
 
 static void
-set_gray_transition_parameter(const stp_vars_t *v,
-			      stp_parameter_t *description,
-			      int expected_channels)
-{
-  const escp2_inkname_t *ink_name = get_inktype(v);
-  description->is_active = 0;
-  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
-      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
-       expected_channels) &&
-      using_automatic_settings(v, AUTO_MODE_MANUAL))
-    fill_transition_parameters(description);
-}
-
-static void
 set_color_transition_parameter(const stp_vars_t *v,
 			       stp_parameter_t *description,
 			       int color)
@@ -1272,6 +1266,22 @@ set_color_transition_parameter(const stp_vars_t *v,
     }
 }
 
+static void
+set_gray_transition_parameter(const stp_vars_t *v,
+			      stp_parameter_t *description,
+			      int expected_channels)
+{
+  const escp2_inkname_t *ink_name = get_inktype(v);
+  description->is_active = 0;
+  if (ink_name && ink_name->channel_set->channels[STP_ECOLOR_K] &&
+      (ink_name->channel_set->channels[STP_ECOLOR_K]->n_subchannels ==
+       expected_channels) &&
+      using_automatic_settings(v, AUTO_MODE_MANUAL))
+    fill_transition_parameters(description);
+  else
+    set_color_transition_parameter(v, description, STP_ECOLOR_K);
+}
+
 static const res_t *
 find_default_resolution(const stp_vars_t *v, int desired_hres, int desired_vres,
 			int strict)
@@ -1679,6 +1689,8 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "GrayTransition") == 0)
     set_gray_transition_parameter(v, description, 2);
+  else if (strcmp(name, "LightGrayTransition") == 0)
+    set_gray_transition_parameter(v, description, 2);
   else if (strcmp(name, "Gray1Transition") == 0 ||
 	   strcmp(name, "Gray2Transition") == 0 ||
 	   strcmp(name, "Gray3Transition") == 0)
@@ -1733,9 +1745,11 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "PrintingMode") == 0)
     {
+      const escp2_inkname_t *ink_name = get_inktype(v);
       description->bounds.str = stp_string_list_create();
-      stp_string_list_add_string
-	(description->bounds.str, "Color", _("Color"));
+      if (!ink_name || ink_name->inkset != INKSET_QUADTONE)
+	stp_string_list_add_string
+	  (description->bounds.str, "Color", _("Color"));
       stp_string_list_add_string
 	(description->bounds.str, "BW", _("Black and White"));
       description->deflt.str =
@@ -1766,6 +1780,7 @@ escp2_parameters(const stp_vars_t *v, const char *name,
     }
   else if (strcmp(name, "MultiChannelLimit") == 0)
     {
+      description->is_active = 0;
       if (stp_get_string_parameter(v, "PrintingMode") &&
 	  strcmp(stp_get_string_parameter(v, "PrintingMode"), "BW") != 0 &&
 	  using_automatic_settings(v, AUTO_MODE_MANUAL))
@@ -1774,8 +1789,6 @@ escp2_parameters(const stp_vars_t *v, const char *name,
 	  if (ink_name && ink_name->inkset == INKSET_CMYKRB)
 	    description->is_active = 1;
 	}
-      else
-	description->is_active = 0;
     }
 }
 
@@ -1944,6 +1957,8 @@ escp2_describe_output(const stp_vars_t *v)
 	{
 	  switch (ink_type->inkset)
 	    {
+	    case INKSET_QUADTONE:
+	      return "Grayscale";
 	    case INKSET_CMYKRB:
 	    case INKSET_CMYK:
 	    case INKSET_CcMmYK:
diff --git a/src/main/print-escp2.h b/src/main/print-escp2.h
index 0982996..8e4d373 100644
--- a/src/main/print-escp2.h
+++ b/src/main/print-escp2.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-escp2.h,v 1.95 2005/08/14 01:27:44 rlk Exp $"
+ * "$Id: print-escp2.h,v 1.97 2005/10/23 19:43:14 rlk Exp $"
  *
  *   Print plug-in EPSON ESC/P2 driver for the GIMP.
  *
@@ -71,7 +71,7 @@ typedef struct
   const double dropsizes[MAX_DROP_SIZES];
 } escp2_dropsize_t;
 
-typedef const escp2_dropsize_t *const escp2_drop_list_t[RES_N];
+typedef const escp2_dropsize_t *escp2_drop_list_t[RES_N];
 
 /*
  ****************************************************************
@@ -525,6 +525,7 @@ extern const escp2_drop_list_t stpi_escp2_variable_3pl_drops;
 extern const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_drops;
 extern const escp2_drop_list_t stpi_escp2_variable_3pl_pigment_c66_drops;
 extern const escp2_drop_list_t stpi_escp2_variable_3pl_pmg_drops;
+extern const escp2_drop_list_t stpi_escp2_variable_r2400_drops;
 extern const escp2_drop_list_t stpi_escp2_variable_1440_4pl_drops;
 extern const escp2_drop_list_t stpi_escp2_variable_ultrachrome_drops;
 extern const escp2_drop_list_t stpi_escp2_variable_2880_4pl_drops;
@@ -536,6 +537,7 @@ extern const paperlist_t stpi_escp2_standard_paper_list;
 extern const paperlist_t stpi_escp2_durabrite_paper_list;
 extern const paperlist_t stpi_escp2_durabrite2_paper_list;
 extern const paperlist_t stpi_escp2_ultrachrome_paper_list;
+extern const paperlist_t stpi_escp2_ultrachrome_k3_paper_list;
 extern const paperlist_t stpi_escp2_r800_paper_list;
 
 extern const paper_adjustment_list_t stpi_escp2_standard_paper_adjustment_list;
@@ -547,6 +549,8 @@ extern const paper_adjustment_list_t stpi_escp2_photo3_paper_adjustment_list;
 extern const paper_adjustment_list_t stpi_escp2_sp960_paper_adjustment_list;
 extern const paper_adjustment_list_t stpi_escp2_ultrachrome_photo_paper_adjustment_list;
 extern const paper_adjustment_list_t stpi_escp2_ultrachrome_matte_paper_adjustment_list;
+extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_photo_paper_adjustment_list;
+extern const paper_adjustment_list_t stpi_escp2_ultrachrome_k3_matte_paper_adjustment_list;
 extern const paper_adjustment_list_t stpi_escp2_r800_photo_paper_adjustment_list;
 extern const paper_adjustment_list_t stpi_escp2_r800_matte_paper_adjustment_list;
 
@@ -581,6 +585,7 @@ extern const inkgroup_t stpi_escp2_ultrachrome_inkgroup;
 extern const inkgroup_t stpi_escp2_f360_photo_inkgroup;
 extern const inkgroup_t stpi_escp2_f360_photo7_japan_inkgroup;
 extern const inkgroup_t stpi_escp2_f360_ultrachrome_inkgroup;
+extern const inkgroup_t stpi_escp2_f360_ultrachrome_k3_inkgroup;
 extern const inkgroup_t stpi_escp2_cmykrb_inkgroup;
 
 extern const escp2_inkname_t stpi_escp2_default_black_inkset;
@@ -705,5 +710,5 @@ extern void stpi_escp2_terminate_page(stp_vars_t *v);
 
 #endif /* GUTENPRINT_INTERNAL_ESCP2_H */
 /*
- * End of "$Id: print-escp2.h,v 1.95 2005/08/14 01:27:44 rlk Exp $".
+ * End of "$Id: print-escp2.h,v 1.97 2005/10/23 19:43:14 rlk Exp $".
  */
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index f879fba..a3dc35d 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,9 +1,10 @@
 /*
- * "$Id: print-olympus.c,v 1.55 2005/07/01 09:56:12 m0m Exp $"
+ * "$Id: print-olympus.c,v 1.57 2005/10/21 08:55:40 m0m Exp $"
  *
  *   Print plug-in Olympus driver for the GIMP.
  *
- *   Copyright 2003 Michael Mraka (Michael.Mraka@linux.cz)
+ *   Copyright 2003 - 2005
+ *   Michael Mraka (Michael.Mraka@linux.cz)
  *
  *   The plug-in is based on the code of the RAW plugin for the GIMP of
  *   Michael Sweet (mike@easysw.com) and Robert Krawitz (rlk@alum.mit.edu)
@@ -908,6 +909,97 @@ static const char updp10_adj_yellow[] =
   "</gutenprint>\n";
 
 
+/* Sony UP-DR150 */
+static const olymp_resolution_t updr150_res[] =
+{
+  { "346x346", 346, 346},
+};
+
+static const olymp_resolution_list_t updr150_res_list =
+{
+  updr150_res, sizeof(updr150_res) / sizeof(olymp_resolution_t)
+};
+
+static const olymp_pagesize_t updr150_page[] =
+{
+  { "w288h432",	"2UPC-153 (4x6)", -1, -1, 0, 0, 3, 2},
+  { "B7",	"2UPC-154 (3.5x5)", -1, -1, 3, 2, 0, 0},
+  { "w360h504",	"2UPC-155 (5x7)", -1, -1, 0, 0, 4, 4},
+  { "w432h576",	"2UPC-156 (6x8)", -1, -1, 3, 2, 5, 4},
+  { "Custom", NULL, -1, -1, 0, 0, 3, 2},
+};
+
+static const olymp_pagesize_list_t updr150_page_list =
+{
+  updr150_page, sizeof(updr150_page) / sizeof(olymp_pagesize_t)
+};
+
+static const olymp_printsize_t updr150_printsize[] =
+{
+  { "346x346", "w288h432", 1382, 2048},
+  { "346x346", "B7", 1210, 1728},
+  { "346x346", "w360h504", 1728, 2380},
+  { "346x346", "w432h576", 2048, 2724},
+  { "346x346", "Custom", 1382, 2048},
+};
+
+static const olymp_printsize_list_t updr150_printsize_list =
+{
+  updr150_printsize, sizeof(updr150_printsize) / sizeof(olymp_printsize_t)
+};
+
+static void updr150_printer_init_func(stp_vars_t *v)
+{
+  char pg = '\0';
+
+  stp_zfwrite("\x6a\xff\xff\xff\xef\xff\xff\xff", 1, 8, v);
+  if (strcmp(privdata.pagesize,"B7") == 0)
+    pg = '\x01';
+  else if (strcmp(privdata.pagesize,"w288h432") == 0)
+    pg = '\x02';
+  else if (strcmp(privdata.pagesize,"w360h504") == 0)
+    pg = '\x03';
+  else if (strcmp(privdata.pagesize,"w432h576") == 0)
+    pg = '\x04';
+  stp_putc(pg, v);
+
+  stp_zfwrite("\x00\x00\x00\xfc\xff\xff\xff"
+	      "\xfb\xff\xff\xff\xf4\xff\xff\xff"
+	      "\xf5\xff\xff\xff\x01\x00\x00\x00"
+	      "\x07\x00\x00\x00\x1b\xe5\x00\x00"
+	      "\x00\x08\x00\x08\x00\x00\x00\x00"
+	      "\x00\x00\x00\x00\x00\x01\x00\xed"
+	      "\xff\xff\xff\x07\x00\x00\x00\x1b"
+	      "\xee\x00\x00\x00\x02\x00\x02\x00"
+	      "\x00\x00\x00\x01\x07\x00\x00\x00"
+	      "\x1b\x15\x00\x00\x00\x0d\x00\x0d"
+	      "\x00\x00\x00\x00\x00\x00\x00\x07"
+	      "\x00\x00\x00\x00", 1, 91, v);
+  stp_put16_be(privdata.xsize, v);
+  stp_put16_be(privdata.ysize, v);
+  stp_zfwrite("\xf9\xff\xff\xff\x07\x00\x00\x00"
+	      "\x1b\xe1\x00\x00\x00\x0b\x00\x0b"
+	      "\x00\x00\x00\x00\x80\x00\x00\x00"
+	      "\x00\x00", 1, 26, v);
+  stp_put16_be(privdata.xsize, v);
+  stp_put16_be(privdata.ysize, v);
+  stp_zfwrite("\xf8\xff\xff\xff\x0b\x00\x00\x00\x1b\xea"
+	      "\x00\x00\x00\x00", 1, 14, v);
+  stp_put32_be(privdata.xsize*privdata.ysize*3, v);
+  stp_zfwrite("\x00", 1, 1, v);
+  stp_put32_le(privdata.xsize*privdata.ysize*3, v);
+}
+
+static void updr150_printer_end_func(stp_vars_t *v)
+{
+	stp_zfwrite("\xfc\xff\xff"
+		    "\xff\xfa\xff\xff\xff\x07\x00\x00"
+		    "\x00\x1b\x0a\x00\x00\x00\x00\x00"
+		    "\x07\x00\x00\x00\x1b\x17\x00\x00"
+		    "\x00\x00\x00\xf3\xff\xff\xff"
+		    , 1, 34, v);
+}
+
 /* Fujifilm CX-400 */
 static const olymp_resolution_t cx400_res[] =
 {
@@ -984,6 +1076,7 @@ static const olymp_resolution_t all_resolutions[] =
   { "300x300", 300, 300},
   { "317x316", 317, 316},
   { "320x320", 320, 320},
+  { "346x346", 346, 346},
 };
 
 static const olymp_resolution_list_t all_res_list =
@@ -993,7 +1086,7 @@ static const olymp_resolution_list_t all_res_list =
 
 static const olympus_cap_t olympus_model_capabilities[] =
 {
-  { /* Olympus P-10 */
+  { /* Olympus P-10, P-11 */
     2, 		
     &rgb_ink_list,
     &res_320dpi_list,
@@ -1084,7 +1177,8 @@ static const olympus_cap_t olympus_model_capabilities[] =
     cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
     NULL,
   },
-  { /* Canon CP-220, CP-330, SELPHY CP-400, SELPHY CP-500, SELPHY CP-600 */
+  { /* Canon CP-220, CP-330, SELPHY CP-400, SELPHY CP-500, SELPHY CP-510,
+       SELPHY CP-600, SELPHY CP-710 */
     1001,
     &ymc_ink_list,
     &res_314dpi_list,
@@ -1116,6 +1210,21 @@ static const olympus_cap_t olympus_model_capabilities[] =
     updp10_adj_cyan, updp10_adj_magenta, updp10_adj_yellow,
     &updp10_laminate_list,
   },
+  { /* Sony UP-DR150 */
+    2001,
+    &rgb_ink_list,
+    &updr150_res_list,
+    &updr150_page_list,
+    &updr150_printsize_list,
+    OLYMPUS_INTERLACE_NONE,
+    1800,
+    OLYMPUS_FEATURE_FULL_WIDTH | OLYMPUS_FEATURE_FULL_HEIGHT,
+    &updr150_printer_init_func, &updr150_printer_end_func,
+    NULL, NULL,
+    NULL, NULL,
+    NULL, NULL, NULL, 
+    NULL,
+  },
   { /* Fujifilm Printpix CX-400  */
     3000,
     &rgb_ink_list,
@@ -1605,7 +1714,8 @@ olympus_do_print(stp_vars_t *v, stp_image_t *image)
   const int model           = stp_get_model_id(v); 
   const char *ink_type      = stp_get_string_parameter(v, "InkType");
   const olympus_cap_t *caps = olympus_get_model_capabilities(model);
-  int max_print_px_width, max_print_px_height;
+  int max_print_px_width = 0;
+  int max_print_px_height = 0;
   int xdpi, ydpi;	/* Resolution */
 
   /* image in pixels */
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index e02b2bd..ea41b4f 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-pcl.c,v 1.139 2005/07/03 22:13:39 rlk Exp $"
+ * "$Id: print-pcl.c,v 1.140 2005/10/18 02:08:17 rlk Exp $"
  *
  *   Print plug-in HP PCL driver for the GIMP.
  *
@@ -1446,7 +1446,7 @@ static const stp_param_string_t duplex_types[] =
  * 'pcl_papersize_valid()' - Is the paper size valid for this printer.
  */
 
-static const int
+static int
 pcl_papersize_valid(const stp_papersize_t *pt,
 		    int model)
 {
diff --git a/src/main/print-ps.c b/src/main/print-ps.c
index 6157db2..9d7e20e 100644
--- a/src/main/print-ps.c
+++ b/src/main/print-ps.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-ps.c,v 1.79 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-ps.c,v 1.81 2005/10/10 12:52:29 rlk Exp $"
  *
  *   Print plug-in Adobe PostScript driver for the GIMP.
  *
@@ -623,6 +623,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   else
     stp_set_string_parameter(nv, "STPIOutputType", "Whitescale");
 
+  stp_set_boolean_parameter(nv, "SimpleGamma", 1);
+
   out_channels = stp_color_init(nv, image, 256);
 
   if (model == 0)
@@ -652,6 +654,8 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
   }
   else
   {
+    unsigned short *tmp_buf =
+      stp_malloc(sizeof(unsigned short) * (image_width * out_channels + 3));
     if (strcmp(print_mode, "Color") == 0)
       stp_puts("/DeviceRGB setcolorspace\n", v);
     else
@@ -681,6 +685,7 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
 
     for (y = 0, out_offset = 0; y < image_height; y ++)
     {
+      unsigned short *where;
       /* FIXME!!! */
       if (stp_color_get_row(nv, image, y /*, out + out_offset */ , &zero_mask))
 	{
@@ -688,23 +693,33 @@ ps_print_internal(const stp_vars_t *v, stp_image_t *image)
 	  break;
 	}
       out = stp_channel_get_input(nv);
+      if (out_offset > 0)
+	{
+	  memcpy(tmp_buf + out_offset, out,
+		 image_width * out_channels * sizeof(unsigned short));
+	  where = tmp_buf;
+	}
+      else
+	where = out;
 
       out_ps_height = out_offset + image_width * out_channels;
 
       if (y < (image_height - 1))
       {
-        ps_ascii85(v, out, out_ps_height & ~3, 0);
+	ps_ascii85(v, where, out_ps_height & ~3, 0);
         out_offset = out_ps_height & 3;
       }
       else
       {
-        ps_ascii85(v, out, out_ps_height, 1);
+        ps_ascii85(v, where, out_ps_height, 1);
         out_offset = 0;
       }
 
       if (out_offset > 0)
-        memcpy(out, out + out_ps_height - out_offset, out_offset);
+        memcpy(tmp_buf, where + out_ps_height - out_offset,
+	       out_offset * sizeof(unsigned short));
     }
+    stp_free(tmp_buf);
   }
   stp_image_conclude(image);
 
diff --git a/src/main/print-raw.c b/src/main/print-raw.c
index f6353f3..dfad151 100644
--- a/src/main/print-raw.c
+++ b/src/main/print-raw.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-raw.c,v 1.36 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-raw.c,v 1.37 2005/09/17 21:54:34 rlk Exp $"
  *
  *   Print plug-in RAW driver for the GIMP.
  *
@@ -237,6 +237,7 @@ raw_print(const stp_vars_t *v, stp_image_t *image)
     }
 
   stp_set_float_parameter(nv, "Density", 1.0);
+  stp_set_boolean_parameter(nv, "SimpleGamma", 1);
   stp_channel_reset(nv);
   for (i = 0; i < ink_channels; i++)
     stp_channel_add(nv, i, 0, 1.0);
diff --git a/src/main/print-vars.c b/src/main/print-vars.c
index 8b480de..5c3d621 100644
--- a/src/main/print-vars.c
+++ b/src/main/print-vars.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: print-vars.c,v 1.73 2004/09/17 18:38:26 rleigh Exp $"
+ * "$Id: print-vars.c,v 1.74 2005/10/26 01:28:35 rlk Exp $"
  *
  *   Print plug-in driver utility functions for the GIMP.
  *
@@ -500,6 +500,12 @@ stp_set_default_string_parameter_n(stp_vars_t *v, const char *parameter,
 				   const char *value, size_t bytes)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_STRING_LIST];
+  if (value)
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s, %s)\n",
+		parameter, value);
+  else
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s)\n",
+		parameter);
   set_default_raw_parameter(list, parameter, value, bytes,
 			    STP_PARAMETER_TYPE_STRING_LIST);
   stp_set_verified(v, 0);
@@ -511,15 +517,7 @@ stp_set_default_string_parameter(stp_vars_t *v, const char *parameter,
 {
   int byte_count = 0;
   if (value)
-    {
-      byte_count = strlen(value);
-      stp_dprintf(STP_DBG_VARS, v,
-		  "stp_set_default_string_parameter(%s, %s)\n",
-		  parameter, value);
-    }
-  else
-    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_string_parameter(%s)\n",
-		parameter);
+    byte_count = strlen(value);
   stp_set_default_string_parameter_n(v, parameter, value, byte_count);
   stp_set_verified(v, 0);
 }
@@ -593,6 +591,12 @@ stp_set_file_parameter(stp_vars_t *v, const char *parameter,
   size_t byte_count = 0;
   if (value)
     byte_count = strlen(value);
+  if (value)
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s, %s)\n",
+		parameter, value);
+  else
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s)\n",
+		parameter);
   set_raw_parameter(list, parameter, value, byte_count,
 		    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -603,6 +607,12 @@ stp_set_file_parameter_n(stp_vars_t *v, const char *parameter,
 			 const char *value, size_t byte_count)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_FILE];
+  if (value)
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s, %s)\n",
+		parameter, value);
+  else
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_file_parameter(%s)\n",
+		parameter);
   set_raw_parameter(list, parameter, value, byte_count,
 		    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -616,6 +626,12 @@ stp_set_default_file_parameter(stp_vars_t *v, const char *parameter,
   size_t byte_count = 0;
   if (value)
     byte_count = strlen(value);
+  if (value)
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s, %s)\n",
+		parameter, value);
+  else
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s)\n",
+		parameter);
   set_default_raw_parameter(list, parameter, value, byte_count,
 			    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -626,6 +642,12 @@ stp_set_default_file_parameter_n(stp_vars_t *v, const char *parameter,
 				 const char *value, size_t byte_count)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_FILE];
+  if (value)
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s, %s)\n",
+		parameter, value);
+  else
+    stp_dprintf(STP_DBG_VARS, v, "stp_set_default_file_parameter(%s)\n",
+		parameter);
   set_default_raw_parameter(list, parameter, value, byte_count,
 			    STP_PARAMETER_TYPE_FILE);
   stp_set_verified(v, 0);
@@ -658,6 +680,7 @@ stp_set_curve_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_CURVE];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_curve_parameter(%s)\n", parameter);
   if (curve)
     {
       value_t *val;
@@ -690,6 +713,8 @@ stp_set_default_curve_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_CURVE];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_curve_parameter(%s)\n",
+	      parameter);
   if (!item)
     {
       if (curve)
@@ -764,6 +789,7 @@ stp_set_default_array_parameter(stp_vars_t *v, const char *parameter,
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_array_parameter(%s)\n", parameter);
   if (!item)
     {
       if (array)
@@ -792,6 +818,8 @@ stp_get_array_parameter(const stp_vars_t *v, const char *parameter)
   const stp_list_t *list = v->params[STP_PARAMETER_TYPE_ARRAY];
   const value_t *val;
   const stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_array_parameter(%s)\n",
+	      parameter);
   if (item)
     {
       val = (const value_t *) stp_list_item_get_data(item);
@@ -807,6 +835,8 @@ stp_set_int_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_int_parameter(%s, %d)\n",
+	      parameter, ival);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -831,6 +861,8 @@ stp_set_default_int_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_int_parameter(%s, %d)\n",
+	      parameter, ival);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -848,6 +880,7 @@ stp_clear_int_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_INT];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_clear_int_parameter(%s)\n", parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -890,6 +923,8 @@ stp_set_boolean_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_boolean_parameter(%s, %d)\n",
+	      parameter, ival);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -918,6 +953,8 @@ stp_set_default_boolean_parameter(stp_vars_t *v, const char *parameter,
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_boolean_parameter(%s, %d)\n",
+	      parameter, ival);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -938,6 +975,7 @@ stp_clear_boolean_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_BOOLEAN];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_clear_boolean_parameter(%s)\n", parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -980,6 +1018,8 @@ stp_set_dimension_parameter(stp_vars_t *v, const char *parameter, int ival)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_dimension_parameter(%s, %d)\n",
+	      parameter, ival);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -1004,6 +1044,8 @@ stp_set_default_dimension_parameter(stp_vars_t *v, const char *parameter, int iv
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_dimension_parameter(%s, %d)\n",
+	      parameter, ival);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -1021,6 +1063,7 @@ stp_clear_dimension_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DIMENSION];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_clear_dimension_parameter(%s)\n", parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
@@ -1063,6 +1106,8 @@ stp_set_float_parameter(stp_vars_t *v, const char *parameter, double dval)
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_float_parameter(%s, %f)\n",
+	      parameter, dval);
   if (item)
     {
       val = (value_t *) stp_list_item_get_data(item);
@@ -1088,6 +1133,8 @@ stp_set_default_float_parameter(stp_vars_t *v, const char *parameter,
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
   value_t *val;
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_set_default_float_parameter(%s, %f)\n",
+	      parameter, dval);
   if (!item)
     {
       val = stp_malloc(sizeof(value_t));
@@ -1105,6 +1152,7 @@ stp_clear_float_parameter(stp_vars_t *v, const char *parameter)
 {
   stp_list_t *list = v->params[STP_PARAMETER_TYPE_DOUBLE];
   stp_list_item_t *item = stp_list_get_item_by_name(list, parameter);
+  stp_dprintf(STP_DBG_VARS, v, "stp_clear_float_parameter(%s)\n", parameter);
   if (item)
     stp_list_item_destroy(list, item);
   stp_set_verified(v, 0);
diff --git a/src/main/printers.xml b/src/main/printers.xml
index 97300b7..d6e9ed3 100644
--- a/src/main/printers.xml
+++ b/src/main/printers.xml
@@ -4,7 +4,7 @@
    XML description of printers known to libgutenprint
    This file was originally generated.  It should be edited by hand.
 
-   "$Id: printers.xml,v 1.124 2005/08/10 11:27:35 rlk Exp $"
+   "$Id: printers.xml,v 1.135 2005/11/21 12:25:38 rlk Exp $"
 -->
 
 <gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
@@ -102,6 +102,10 @@
         <parameter type="float" name="Gamma">1.000</parameter>
         <parameter type="float" name="Density">0.800</parameter>
       </printer>
+      <printer name="Canon S200" driver="bjc-s200" manufacturer="Canon" model="4202">
+        <parameter type="float" name="Gamma">0.800</parameter>
+        <parameter type="float" name="Density">0.900</parameter>
+      </printer>
       <printer name="Canon S400" driver="bjc-s400" manufacturer="Canon" model="3000">
         <parameter type="float" name="Gamma">1.000</parameter>
         <parameter type="float" name="Density">0.800</parameter>
@@ -124,6 +128,12 @@
       </printer>
     </family>
     <family name="escp2">
+      <printer name="EPSON Stylus C20" driver="escp2-c20" manufacturer="Epson" model="42">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -136,6 +146,12 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C40" driver="escp2-c40" manufacturer="Epson" model="43">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C40SX" driver="escp2-c40sx" manufacturer="Epson" model="43">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -148,6 +164,12 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C41" driver="escp2-c41" manufacturer="Epson" model="43">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C41SX" driver="escp2-c41sx" manufacturer="Epson" model="43">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -160,6 +182,12 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C42" driver="escp2-c42" manufacturer="Epson" model="43">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C42SX" driver="escp2-c42sx" manufacturer="Epson" model="43">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -172,6 +200,12 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C43" driver="escp2-c43" manufacturer="Epson" model="43">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C43SX" driver="escp2-c43sx" manufacturer="Epson" model="43">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -184,6 +218,12 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C44" driver="escp2-c44" manufacturer="Epson" model="43">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C44SX" driver="escp2-c44sx" manufacturer="Epson" model="43">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -208,6 +248,12 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C48" driver="escp2-c48" manufacturer="Epson" model="43">
+        <parameter type="float" name="MagentaGamma">0.95</parameter>
+        <parameter type="float" name="YellowGamma">0.9</parameter>
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C50" driver="escp2-c50" manufacturer="Epson" model="56">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -242,6 +288,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C68" driver="escp2-c68" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus C70" driver="escp2-c70" manufacturer="Epson" model="44">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -270,6 +320,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus C88" driver="escp2-c88" manufacturer="Epson" model="69">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus Color" driver="escp2" manufacturer="Epson" model="0">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -518,6 +572,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus Photo R220" driver="escp2-r220" manufacturer="Epson" model="63">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus Photo R300" driver="escp2-r300" manufacturer="Epson" model="63">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -526,6 +584,14 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus Photo R320" driver="escp2-r320" manufacturer="Epson" model="63">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus Photo R340" driver="escp2-r340" manufacturer="Epson" model="63">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus Photo RX400" driver="escp2-rx400" manufacturer="Epson" model="63">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -562,6 +628,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus Photo RX700" driver="escp2-rx700" manufacturer="Epson" model="70">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus Photo R800" driver="escp2-r800" manufacturer="Epson" model="64">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -570,6 +640,10 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus Photo R2400" driver="escp2-r2400" manufacturer="Epson" model="71">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus Pro 5000" driver="escp2-5000" manufacturer="Epson" model="27">
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
@@ -643,6 +717,25 @@
         <parameter type="float" name="Gamma">0.470</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX3700" driver="escp2-cx3700" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus CX3800" driver="escp2-cx3800" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus CX3810" driver="escp2-cx3810" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus CX4200" driver="escp2-cx4200" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus CX4600" driver="escp2-cx4600" manufacturer="Epson" model="65">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -650,6 +743,20 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX4700" driver="escp2-cx4700" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus CX4800" driver="escp2-cx4800" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus CX5100" driver="escp2-cx5100" manufacturer="Epson" model="55">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -678,6 +785,13 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX5800" driver="escp2-cx5800" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus CX6300" driver="escp2-cx6300" manufacturer="Epson" model="60">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -706,6 +820,20 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus CX7700" driver="escp2-cx7700" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus CX7800" driver="escp2-cx7800" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON Stylus CX8300" driver="escp2-cx8300" manufacturer="Epson" model="60">
         <parameter type="float" name="CyanGamma">0.96</parameter>
         <parameter type="float" name="MagentaGamma">1.02</parameter>
@@ -720,6 +848,33 @@
         <parameter type="float" name="Gamma">0.500</parameter>
         <parameter type="float" name="Density">1.0</parameter>
       </printer>
+      <printer name="EPSON Stylus D68" driver="escp2-d68" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus D88" driver="escp2-d88" manufacturer="Epson" model="69">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus DX3800" driver="escp2-dx3800" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus DX3850" driver="escp2-dx3850" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus DX4200" driver="escp2-dx4200" manufacturer="Epson" model="65">
+        <parameter type="float" name="CyanGamma">0.96</parameter>
+        <parameter type="float" name="MagentaGamma">1.02</parameter>
+        <parameter type="float" name="YellowGamma">1.02</parameter>
+        <parameter type="float" name="Gamma">0.500</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
+      <printer name="EPSON Stylus DX4800" driver="escp2-dx4800" manufacturer="Epson" model="66">
+        <parameter type="float" name="Gamma">0.470</parameter>
+        <parameter type="float" name="Density">1.0</parameter>
+      </printer>
       <printer name="EPSON CL-700" driver="escp2-cl700" manufacturer="Epson" model="38">
         <parameter type="float" name="MagentaGamma">0.95</parameter>
         <parameter type="float" name="YellowGamma">0.9</parameter>
@@ -1219,6 +1374,8 @@
       </printer>
       <printer name="Sony UP-DP10" driver="sony-updp10" manufacturer="Sony" model="2000">
       </printer>
+      <printer name="Sony UP-DR150" driver="sony-updr150" manufacturer="Sony" model="2001">
+      </printer>
       <printer name="Fujifilm Printpix CX-400" driver="fujifilm-cx400" manufacturer="Fujifilm" model="3000">
       </printer>
       <printer name="Fujifilm Printpix CX-550" driver="fujifilm-cx550" manufacturer="Fujifilm" model="3001">
diff --git a/src/testpattern/Makefile.am b/src/testpattern/Makefile.am
index 8733129..45027ff 100644
--- a/src/testpattern/Makefile.am
+++ b/src/testpattern/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.22 2004/09/17 18:38:27 rleigh Exp $
+## $Id: Makefile.am,v 1.23 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/src/testpattern/Makefile.in b/src/testpattern/Makefile.in
index 0bb1ead..c34aede 100644
--- a/src/testpattern/Makefile.in
+++ b/src/testpattern/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -17,8 +17,6 @@
 # Variables
 
 
-SOURCES = printers.c $(testpattern_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -71,8 +69,8 @@ am_testpattern_OBJECTS = testpattern.$(OBJEXT) testpatterny.$(OBJEXT) \
 testpattern_OBJECTS = $(am_testpattern_OBJECTS)
 testpattern_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -102,8 +100,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkgdatadir = $(datadir)/$(PACKAGE)/samples
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -141,7 +137,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -154,14 +149,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -296,13 +289,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -348,8 +336,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 TESTS = run-testpattern run-testpattern-1
 AM_LFLAGS = -i
@@ -373,9 +359,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/testpattern/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps src/testpattern/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  src/testpattern/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps src/testpattern/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -446,31 +432,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpattern.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpatternl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testpatterny.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 .l.c:
 	$(LEXCOMPILE) $<
@@ -716,7 +685,6 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -742,7 +710,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/testpattern/testpatternl.c b/src/testpattern/testpatternl.c
index ad2e0c6..cb68f00 100644
--- a/src/testpattern/testpatternl.c
+++ b/src/testpattern/testpatternl.c
@@ -1,32 +1,85 @@
-/* A lexical scanner generated by flex */
 
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- */
+#line 3 "testpatternl.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 31
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
 
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
 #include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
 #endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
 
-#include <stdlib.h>
-#include <unistd.h>
-
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
-
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
@@ -34,34 +87,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -76,71 +112,71 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE yyrestart(yyin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
+#endif
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
 
 extern int yyleng;
+
 extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    #define YY_LESS_LINENO(n)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
 		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -177,12 +213,16 @@ struct yy_buffer_state
 	 */
 	int yy_at_bol;
 
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -196,23 +236,33 @@ struct yy_buffer_state
 	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
 int yyleng;
 
 /* Points to current character in buffer. */
@@ -225,69 +275,93 @@ static int yy_start = 0;	/* start state number */
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
-static void yy_flex_free YY_PROTO(( void * ));
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
 
 #define yy_new_buffer yy_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define yywrap() 1
+#define yywrap(n) 1
 #define YY_SKIP_YYWRAP
+
 typedef unsigned char YY_CHAR;
+
 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
 typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
 extern char *yytext;
 #define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
  * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yyleng = (int) (yy_cp - yy_bp); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	yyleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 49
 #define YY_END_OF_BUFFER 50
-static yyconst short int yy_accept[233] =
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[233] =
     {   0,
         0,    0,   50,   49,   46,   48,   49,   47,   49,   49,
        43,   32,   45,   45,   45,   45,   45,   45,   45,   45,
@@ -317,7 +391,7 @@ static yyconst short int yy_accept[233] =
        16,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -349,7 +423,7 @@ static yyconst int yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[38] =
+static yyconst flex_int32_t yy_meta[38] =
     {   0,
         1,    1,    2,    3,    1,    1,    1,    4,    4,    4,
         1,    4,    4,    4,    4,    4,    4,    4,    4,    4,
@@ -357,7 +431,7 @@ static yyconst int yy_meta[38] =
         4,    4,    4,    4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[237] =
+static yyconst flex_int16_t yy_base[237] =
     {   0,
         0,    0,  468,  469,  465,  469,    0,    0,  460,  455,
        29,  469,  455,   31,   32,   33,   34,   35,   40,   47,
@@ -387,7 +461,7 @@ static yyconst short int yy_base[237] =
       343,  469,  412,  416,  420,  115
     } ;
 
-static yyconst short int yy_def[237] =
+static yyconst flex_int16_t yy_def[237] =
     {   0,
       232,    1,  232,  232,  232,  232,  233,  234,  235,  232,
       236,  232,  236,  236,  236,  236,  236,  236,  236,  236,
@@ -417,7 +491,7 @@ static yyconst short int yy_def[237] =
       236,    0,  232,  232,  232,  232
     } ;
 
-static yyconst short int yy_nxt[507] =
+static yyconst flex_int16_t yy_nxt[507] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   10,    4,   11,
        12,   13,   13,   14,   15,   16,   17,   13,   18,   19,
@@ -477,7 +551,7 @@ static yyconst short int yy_nxt[507] =
       232,  232,  232,  232,  232,  232
     } ;
 
-static yyconst short int yy_chk[507] =
+static yyconst flex_int16_t yy_chk[507] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -540,6 +614,9 @@ static yyconst short int yy_chk[507] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
  */
@@ -549,7 +626,6 @@ static char *yy_last_accepting_cpos;
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
 #line 1 "testpatternl.l"
-#define INITIAL 0
 /*
  * "$Id: testpatternl.l,v 1.17 2005/07/28 00:58:45 rlk Exp $"
  *
@@ -611,7 +687,21 @@ do							\
  while (0)
 
 
-#line 615 "testpatternl.c"
+#line 691 "testpatternl.c"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -619,65 +709,30 @@ do							\
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int yywrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
+extern int yywrap (void );
 #endif
 #endif
 
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+    static void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
 
+#ifdef __cplusplus
+static int yyinput (void );
 #else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (void );
 #endif
 
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
 /* Amount of stuff to slurp up with each read. */
@@ -686,7 +741,6 @@ YY_MALLOC_DECL
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
@@ -699,9 +753,10 @@ YY_MALLOC_DECL
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -711,9 +766,22 @@ YY_MALLOC_DECL
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -734,12 +802,18 @@ YY_MALLOC_DECL
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
 
 /* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
@@ -756,27 +830,29 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
+    
 #line 73 "testpatternl.l"
 
 
-#line 769 "testpatternl.c"
+#line 845 "testpatternl.c"
 
-	if ( yy_init )
+	if ( (yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 0;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
 		if ( ! yyin )
 			yyin = stdin;
@@ -784,34 +860,36 @@ YY_DECL
 		if ( ! yyout )
 			yyout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yy_create_buffer(yyin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		yy_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
 		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
-				yy_last_accepting_state = yy_current_state;
-				yy_last_accepting_cpos = yy_cp;
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
 				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
@@ -828,24 +906,22 @@ yy_find_action:
 		yy_act = yy_accept[yy_current_state];
 		if ( yy_act == 0 )
 			{ /* have to back up */
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
 			case 0: /* must back up */
 			/* undo the effects of YY_DO_BEFORE_ACTION */
-			*yy_cp = yy_hold_char;
-			yy_cp = yy_last_accepting_cpos;
-			yy_current_state = yy_last_accepting_state;
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
 			goto yy_find_action;
 
 case 1:
@@ -1069,6 +1145,7 @@ YY_RULE_SETUP
 yylval.dval = strtod(yytext, NULL); DBG(tDOUBLE); return tDOUBLE;
 	YY_BREAK
 case 45:
+/* rule 45 can match eol */
 YY_RULE_SETUP
 #line 121 "testpatternl.l"
 yylval.sval = c_strstrip(yytext); DBG(tSTRING); return tSTRING;
@@ -1084,6 +1161,7 @@ YY_RULE_SETUP
 DBG(comment); 	/* Skip comments */
 	YY_BREAK
 case 48:
+/* rule 48 can match eol */
 YY_RULE_SETUP
 #line 124 "testpatternl.l"
 DBG(newline); mylineno++;
@@ -1093,33 +1171,33 @@ YY_RULE_SETUP
 #line 125 "testpatternl.l"
 ECHO;
 	YY_BREAK
-#line 1097 "testpatternl.c"
+#line 1175 "testpatternl.c"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
 			 * just pointed yyin at a new source and called
 			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1129,13 +1207,13 @@ case YY_STATE_EOF(INITIAL):
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1148,30 +1226,30 @@ case YY_STATE_EOF(INITIAL):
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_c_buf_p);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( yywrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
@@ -1182,7 +1260,7 @@ case YY_STATE_EOF(INITIAL):
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1190,30 +1268,30 @@ case YY_STATE_EOF(INITIAL):
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1224,8 +1302,7 @@ case YY_STATE_EOF(INITIAL):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1234,21 +1311,20 @@ case YY_STATE_EOF(INITIAL):
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1268,34 +1344,30 @@ static int yy_get_next_buffer()
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1308,8 +1380,7 @@ static int yy_get_next_buffer()
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1319,35 +1390,35 @@ static int yy_get_next_buffer()
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			yyrestart(yyin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1355,32 +1426,31 @@ static int yy_get_next_buffer()
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
-			yy_last_accepting_state = yy_current_state;
-			yy_last_accepting_cpos = yy_cp;
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
 			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
@@ -1392,30 +1462,23 @@ static yy_state_type yy_get_previous_state()
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
-	register char *yy_cp = yy_c_buf_p;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
-		yy_last_accepting_state = yy_current_state;
-		yy_last_accepting_cpos = yy_cp;
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
 		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
@@ -1427,80 +1490,73 @@ yy_state_type yy_current_state;
 	yy_is_jam = (yy_current_state == 232);
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
-
+}
 
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
+    static void yyunput (int c, register char * yy_bp )
+{
+	register char *yy_cp;
+    
+    yy_cp = (yy_c_buf_p);
 
 	/* undo effects of setting up yytext */
-	*yy_cp = yy_hold_char;
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
-
-
+#ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1514,16 +1570,16 @@ static int input()
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					yyrestart(yyin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
+					if ( yywrap( ) )
 						return EOF;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1533,90 +1589,92 @@ static int input()
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
-
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	return c;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
 	}
 
+	yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yy_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
+     */
+	yyensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yy_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
 	 * EOF (yywrap()) processing, but the only time this flag
 	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void yy_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
@@ -1625,80 +1683,75 @@ int size;
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	yy_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
-
+		yyfree((void *) b->yy_ch_buf  );
 
-#ifndef YY_ALWAYS_INTERACTIVE
-#ifndef YY_NEVER_INTERACTIVE
-extern int isatty YY_PROTO(( int ));
-#endif
-#endif
-
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
+	yyfree((void *) b  );
+}
 
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	yy_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
 
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1715,29 +1768,121 @@ YY_BUFFER_STATE b;
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyensure_buffer_stack();
+
+	/* This block is copied from yy_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yy_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yy_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
@@ -1751,47 +1896,43 @@ yy_size_t size;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	yy_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * @param yy_str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
+{
+    
+	return yy_scan_bytes(yy_str,strlen(yy_str) );
+}
 
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * bytes, int  len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	buf = (char *) yyalloc(n  );
 	if ( ! buf )
 		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
@@ -1800,7 +1941,7 @@ int len;
 
 	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = yy_scan_buffer(buf,n );
 	if ( ! b )
 		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
@@ -1810,148 +1951,164 @@ int len;
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
+}
 
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
 #endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
-		{
-		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+/* Redefine yyless() so it works in section 3 code. */
 
-		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
 
-		if ( ! yy_start_stack )
-			YY_FATAL_ERROR(
-			"out of memory expanding start-condition stack" );
-		}
+/* Accessor  methods (get/set functions) to struct members. */
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
 
-	BEGIN(new_state);
-	}
-#endif
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
 
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
-		YY_FATAL_ERROR( "start-condition stack underflow" );
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
+/** Get the current token.
+ * 
+ */
 
+char *yyget_text  (void)
+{
+        return yytext;
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
 
-#ifndef YY_EXIT_FAILURE
-#define YY_EXIT_FAILURE 2
-#endif
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
-	exit( YY_EXIT_FAILURE );
-	}
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
 
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
 
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
 
-/* Redefine yyless() so it works in section 3 code. */
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yy_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yypop_buffer_state();
+	}
 
-#undef yyless
-#define yyless(n) \
-	do \
-		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
-		} \
-	while ( 0 )
+	/* Destroy the stack itself. */
+	yyfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
 
+    return 0;
+}
 
-/* Internal utility routines. */
+/*
+ * Internal utility routines.
+ */
 
 #ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
-#else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
-#endif
-	{
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
-	for ( i = 0; i < n; ++i )
+    	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
-	for ( n = 0; s[n]; ++n )
+    	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *yyalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -1960,23 +2117,25 @@ yy_size_t size;
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void yyfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
+}
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
+#define YYTABLES_NAME "yytables"
+
+#undef YY_NEW_FILE
+#undef YY_FLUSH_BUFFER
+#undef yy_set_bol
+#undef yy_new_buffer
+#undef yy_set_interactive
+#undef yytext_ptr
+#undef YY_DO_BEFORE_ACTION
+
+#ifdef YY_DECL_IS_OURS
+#undef YY_DECL_IS_OURS
+#undef YY_DECL
 #endif
 #line 125 "testpatternl.l"
diff --git a/src/testpattern/testpatterny.c b/src/testpattern/testpatterny.c
index ede6285..cd1c6d3 100644
--- a/src/testpattern/testpatterny.c
+++ b/src/testpattern/testpatterny.c
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    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
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -36,6 +36,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.1"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -99,6 +102,7 @@
      END = 301
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
@@ -228,6 +232,11 @@ find_color(const char *name)
 # define YYERROR_VERBOSE 0
 #endif
 
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
 typedef int YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -240,22 +249,48 @@ typedef int YYSTYPE;
 /* Copy the second part of user declarations.  */
 
 
-/* Line 214 of yacc.c.  */
-#line 244 "testpatterny.c"
+/* Line 219 of yacc.c.  */
+#line 254 "testpatterny.c"
+
+#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
+# define YYSIZE_T __SIZE_TYPE__
+#endif
+#if ! defined (YYSIZE_T) && defined (size_t)
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T) && (defined (__STDC__) || defined (__cplusplus))
+# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+# define YYSIZE_T size_t
+#endif
+#if ! defined (YYSIZE_T)
+# define YYSIZE_T unsigned int
+#endif
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
 
 #if ! defined (yyoverflow) || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
-# if YYSTACK_USE_ALLOCA
-#  define YYSTACK_ALLOC alloca
-# else
-#  ifndef YYSTACK_USE_ALLOCA
-#   if defined (alloca) || defined (_ALLOCA_H)
-#    define YYSTACK_ALLOC alloca
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
 #   else
-#    ifdef __GNUC__
-#     define YYSTACK_ALLOC __builtin_alloca
+#    define YYSTACK_ALLOC alloca
+#    if defined (__STDC__) || defined (__cplusplus)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     define YYINCLUDED_STDLIB_H
 #    endif
 #   endif
 #  endif
@@ -264,25 +299,51 @@ typedef int YYSTYPE;
 # ifdef YYSTACK_ALLOC
    /* Pacify GCC's `empty if-body' warning. */
 #  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2005 */
+#  endif
 # else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM ((YYSIZE_T) -1)
+#  endif
+#  ifdef __cplusplus
+extern "C" {
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if (! defined (malloc) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if (! defined (free) && ! defined (YYINCLUDED_STDLIB_H) \
+	&& (defined (__STDC__) || defined (__cplusplus)))
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifdef __cplusplus
+}
 #  endif
-#  define YYSTACK_ALLOC malloc
-#  define YYSTACK_FREE free
 # endif
 #endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
 
 
 #if (! defined (yyoverflow) \
      && (! defined (__cplusplus) \
-	 || (YYSTYPE_IS_TRIVIAL)))
+	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short yyss;
+  short int yyss;
   YYSTYPE yyvs;
   };
 
@@ -292,20 +353,20 @@ union yyalloc
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short) + sizeof (YYSTYPE))				\
+     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if 1 < __GNUC__
+#  if defined (__GNUC__) && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
@@ -334,7 +395,7 @@ union yyalloc
 #if defined (__STDC__) || defined (__cplusplus)
    typedef signed char yysigned_char;
 #else
-   typedef short yysigned_char;
+   typedef short int yysigned_char;
 #endif
 
 /* YYFINAL -- State number of the termination state. */
@@ -355,7 +416,7 @@ union yyalloc
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   301
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
@@ -397,7 +458,7 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short yyprhs[] =
+static const unsigned short int yyprhs[] =
 {
        0,     0,     3,     5,     7,     9,    11,    13,    15,    17,
       19,    22,    25,    28,    31,    34,    37,    41,    43,    45,
@@ -450,7 +511,7 @@ static const yysigned_char yyrhs[] =
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short yyrline[] =
+static const unsigned short int yyrline[] =
 {
        0,   139,   139,   139,   139,   139,   140,   140,   140,   140,
      143,   155,   167,   179,   191,   203,   215,   227,   227,   227,
@@ -467,38 +528,38 @@ static const unsigned short yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals. */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN", 
-  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK", 
-  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER", 
-  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE", 
-  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN", 
-  "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK", 
-  "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE", 
-  "MESSAGE", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", "rgbspec", 
-  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec", 
-  "inputspec", "level", "channel_level", "gamma", "channel_gamma", 
-  "global_gamma", "steps", "ink_limit", "printer", "page_size_name", 
-  "page_size_custom", "page_size", "parameter_string", "parameter_int", 
-  "parameter_float", "parameter", "density", "top", "left", "hsize", 
-  "vsize", "blackline", "color_block1", "color_blocks1a", 
-  "color_blocks1b", "color_blocks1", "color_block2a", "color_block2b", 
-  "color_block2", "color_blocks2a", "color_blocks2", "color_blocks", 
-  "patvars", "pattern", "xpattern", "grid", "image", "Message0", 
-  "Message1", "Message2", "Message3", "Message4", "A_Message", "message", 
-  "A_Rule", "Rule", "A_Pattern", "Pattern", "Patterns", "Image", "Rules", 
-  "Output", "EOF", "Thing", "@1", 0
+  "$end", "error", "$undefined", "tINT", "tDOUBLE", "tSTRING", "CYAN",
+  "L_CYAN", "MAGENTA", "L_MAGENTA", "YELLOW", "D_YELLOW", "BLACK",
+  "L_BLACK", "GAMMA", "LEVEL", "STEPS", "INK_LIMIT", "PRINTER",
+  "PARAMETER", "PARAMETER_INT", "PARAMETER_FLOAT", "PARAMETER_CURVE",
+  "DENSITY", "TOP", "LEFT", "HSIZE", "VSIZE", "BLACKLINE", "PATTERN",
+  "XPATTERN", "EXTENDED", "IMAGE", "GRID", "SEMI", "CHANNEL", "CMYK",
+  "KCMY", "RGB", "CMY", "GRAY", "WHITE", "RAW", "MODE", "PAGESIZE",
+  "MESSAGE", "END", "$accept", "COLOR", "cmykspec", "kcmyspec", "rgbspec",
+  "cmyspec", "grayspec", "whitespec", "extendedspec", "modespec",
+  "inputspec", "level", "channel_level", "gamma", "channel_gamma",
+  "global_gamma", "steps", "ink_limit", "printer", "page_size_name",
+  "page_size_custom", "page_size", "parameter_string", "parameter_int",
+  "parameter_float", "parameter", "density", "top", "left", "hsize",
+  "vsize", "blackline", "color_block1", "color_blocks1a", "color_blocks1b",
+  "color_blocks1", "color_block2a", "color_block2b", "color_block2",
+  "color_blocks2a", "color_blocks2", "color_blocks", "patvars", "pattern",
+  "xpattern", "grid", "image", "Message0", "Message1", "Message2",
+  "Message3", "Message4", "A_Message", "message", "A_Rule", "Rule",
+  "A_Pattern", "Pattern", "Patterns", "Image", "Rules", "Output", "EOF",
+  "Thing", "@1", 0
 };
 #endif
 
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short yytoknum[] =
+static const unsigned short int yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -567,7 +628,7 @@ static const unsigned char yydefact[] =
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short yydefgoto[] =
+static const short int yydefgoto[] =
 {
       -1,   137,    85,    86,    87,    88,    89,    90,    91,    92,
       20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
@@ -581,7 +642,7 @@ static const short yydefgoto[] =
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -131
-static const short yypact[] =
+static const short int yypact[] =
 {
     -131,   -14,    16,    56,    41,    25,    36,    38,    53,    66,
       67,    69,    70,    77,    78,    79,    81,    39,    22,    80,
@@ -603,7 +664,7 @@ static const short yypact[] =
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short yypgoto[] =
+static const short int yypgoto[] =
 {
     -131,    52,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
     -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,  -131,
@@ -678,22 +739,6 @@ static const unsigned char yystos[] =
        4,     4,     4,     4,    79,     4,     4,     4,     4,     4
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -701,7 +746,8 @@ static const unsigned char yystos[] =
 
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrlab1
+#define YYERROR		goto yyerrorlab
+
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
@@ -722,26 +768,59 @@ do								\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (0)
 
+
 #define YYTERROR	1
 #define YYERRCODE	256
 
-/* YYLLOC_DEFAULT -- Compute the default location (before the actions
-   are run).  */
 
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 #ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)         \
-  Current.first_line   = Rhs[1].first_line;      \
-  Current.first_column = Rhs[1].first_column;    \
-  Current.last_line    = Rhs[N].last_line;       \
-  Current.last_column  = Rhs[N].last_column;
+# define YYLLOC_DEFAULT(Current, Rhs, N)				\
+    do									\
+      if (N)								\
+	{								\
+	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
+	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
+	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
+	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
+	}								\
+      else								\
+	{								\
+	  (Current).first_line   = (Current).last_line   =		\
+	    YYRHSLOC (Rhs, 0).last_line;				\
+	  (Current).first_column = (Current).last_column =		\
+	    YYRHSLOC (Rhs, 0).last_column;				\
+	}								\
+    while (0)
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+              (Loc).first_line, (Loc).first_column,	\
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
+
 /* YYLEX -- calling `yylex' with the right arguments.  */
 
 #ifdef YYLEX_PARAM
@@ -764,36 +843,30 @@ do {						\
     YYFPRINTF Args;				\
 } while (0)
 
-# define YYDSYMPRINT(Args)			\
-do {						\
-  if (yydebug)					\
-    yysymprint Args;				\
-} while (0)
-
-# define YYDSYMPRINTF(Title, Token, Value, Location)		\
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
 do {								\
   if (yydebug)							\
     {								\
       YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Token, Value);	\
+      yysymprint (stderr,					\
+                  Type, Value);	\
       YYFPRINTF (stderr, "\n");					\
     }								\
 } while (0)
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (cinluded).                                                   |
+| TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yy_stack_print (short *bottom, short *top)
+yy_stack_print (short int *bottom, short int *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short *bottom;
-    short *top;
+    short int *bottom;
+    short int *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
@@ -823,13 +896,13 @@ yy_reduce_print (yyrule)
 #endif
 {
   int yyi;
-  unsigned int yylineno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylineno);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu), ",
+             yyrule - 1, yylno);
   /* Print the symbols being reduced, and their result.  */
   for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+    YYFPRINTF (stderr, "%s ", yytname[yyrhs[yyi]]);
+  YYFPRINTF (stderr, "-> %s\n", yytname[yyr1[yyrule]]);
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
@@ -843,8 +916,7 @@ do {					\
 int yydebug;
 #else /* !YYDEBUG */
 # define YYDPRINTF(Args)
-# define YYDSYMPRINT(Args)
-# define YYDSYMPRINTF(Title, Token, Value, Location)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
 # define YY_STACK_PRINT(Bottom, Top)
 # define YY_REDUCE_PRINT(Rule)
 #endif /* !YYDEBUG */
@@ -859,13 +931,9 @@ int yydebug;
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
-#if YYMAXDEPTH == 0
-# undef YYMAXDEPTH
-#endif
-
 #ifndef YYMAXDEPTH
 # define YYMAXDEPTH 10000
 #endif
@@ -887,7 +955,7 @@ yystrlen (yystr)
      const char *yystr;
 #   endif
 {
-  register const char *yys = yystr;
+  const char *yys = yystr;
 
   while (*yys++ != '\0')
     continue;
@@ -912,8 +980,8 @@ yystpcpy (yydest, yysrc)
      const char *yysrc;
 #   endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -923,7 +991,55 @@ yystpcpy (yydest, yysrc)
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      size_t yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+#endif /* YYERROR_VERBOSE */
 
 
 
@@ -947,15 +1063,15 @@ yysymprint (yyoutput, yytype, yyvaluep)
   (void) yyvaluep;
 
   if (yytype < YYNTOKENS)
-    {
-      YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-# ifdef YYPRINT
-      YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-    }
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
+
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# endif
   switch (yytype)
     {
       default:
@@ -971,10 +1087,11 @@ yysymprint (yyoutput, yytype, yyvaluep)
 
 #if defined (__STDC__) || defined (__cplusplus)
 static void
-yydestruct (int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
 static void
-yydestruct (yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep)
+    const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
 #endif
@@ -982,6 +1099,10 @@ yydestruct (yytype, yyvaluep)
   /* Pacify ``unused variable'' warnings.  */
   (void) yyvaluep;
 
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
   switch (yytype)
     {
 
@@ -1009,10 +1130,10 @@ int yyparse ();
 
 
 
-/* The lookahead symbol.  */
+/* The look-ahead symbol.  */
 int yychar;
 
-/* The semantic value of the lookahead symbol.  */
+/* The semantic value of the look-ahead symbol.  */
 YYSTYPE yylval;
 
 /* Number of syntax errors so far.  */
@@ -1038,17 +1159,17 @@ yyparse (void)
 #else
 int
 yyparse ()
-
+    ;
 #endif
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
-  /* Lookahead token as an internal (translated) token number.  */
+  /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
 
   /* Three stacks and their tools:
@@ -1060,14 +1181,14 @@ yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short	yyssa[YYINITDEPTH];
-  short *yyss = yyssa;
-  register short *yyssp;
+  short int yyssa[YYINITDEPTH];
+  short int *yyss = yyssa;
+  short int *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
@@ -1124,14 +1245,14 @@ yyparse ()
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1142,21 +1263,21 @@ yyparse ()
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short *yyss1 = yyss;
+	short int *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -1188,18 +1309,18 @@ yyparse ()
 yybackup:
 
 /* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
+/* Read a look-ahead token if we need one and don't already have one.  */
 /* yyresume: */
 
-  /* First try to decide what to do without reference to lookahead token.  */
+  /* First try to decide what to do without reference to look-ahead token.  */
 
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
 
-  /* Not known => get a lookahead token if don't already have one.  */
+  /* Not known => get a look-ahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
@@ -1214,7 +1335,7 @@ yybackup:
   else
     {
       yytoken = YYTRANSLATE (yychar);
-      YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
     }
 
   /* If the proper action on seeing token YYTOKEN is to reduce or to
@@ -1234,8 +1355,8 @@ yybackup:
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  /* Shift the lookahead token.  */
-  YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
   /* Discard the token being shifted unless it is eof.  */
   if (yychar != YYEOF)
@@ -1288,12 +1409,12 @@ yyreduce:
 #line 144 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmykspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>cmykspec %d\n", (yyvsp[0].ival));
 	  global_image_type = "CMYK";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
@@ -1301,12 +1422,12 @@ yyreduce:
 #line 156 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>kcmyspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>kcmyspec %d\n", (yyvsp[0].ival));
 	  global_image_type = "KCMY";
 	  global_channel_depth = 4;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
@@ -1314,12 +1435,12 @@ yyreduce:
 #line 168 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>rgbspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>rgbspec %d\n", (yyvsp[0].ival));
 	  global_image_type = "RGB";
 	  global_channel_depth = 3;
 	  global_invert_data = 1;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
@@ -1327,12 +1448,12 @@ yyreduce:
 #line 180 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>cmyspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>cmyspec %d\n", (yyvsp[0].ival));
 	  global_image_type = "CMY";
 	  global_channel_depth = 3;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
@@ -1340,12 +1461,12 @@ yyreduce:
 #line 192 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>grayspec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>grayspec %d\n", (yyvsp[0].ival));
 	  global_image_type = "Grayscale";
 	  global_channel_depth = 1;
 	  global_invert_data = 0;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
@@ -1353,12 +1474,12 @@ yyreduce:
 #line 204 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>whitespec %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>whitespec %d\n", (yyvsp[0].ival));
 	  global_image_type = "Whitescale";
 	  global_channel_depth = 1;
 	  global_invert_data = 1;
-	  if (yyvsp[0].ival == 8 || yyvsp[0].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  if ((yyvsp[0].ival) == 8 || (yyvsp[0].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
@@ -1366,23 +1487,23 @@ yyreduce:
 #line 216 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>extendedspec %d\n", yyvsp[-1].ival);
+	    fprintf(stderr, ">>>extendedspec %d\n", (yyvsp[-1].ival));
 	  global_image_type = "Raw";
 	  global_invert_data = 0;
-	  global_channel_depth = yyvsp[-1].ival;
-	  if (yyvsp[-1].ival == 8 || yyvsp[-1].ival == 16)
-	    global_bit_depth = yyvsp[0].ival;
+	  global_channel_depth = (yyvsp[-1].ival);
+	  if ((yyvsp[-1].ival) == 8 || (yyvsp[-1].ival) == 16)
+	    global_bit_depth = (yyvsp[0].ival);
 	}
     break;
 
   case 25:
 #line 234 "testpatterny.y"
     {
-	  int channel = find_color(yyvsp[-1].sval);
+	  int channel = find_color((yyvsp[-1]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>level %s %f\n", yyvsp[-1].sval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>level %s %f\n", (yyvsp[-1]).sval, (yyvsp[0].dval));
 	  if (channel >= 0)
-	    global_levels[channel] = yyvsp[0].dval;
+	    global_levels[channel] = (yyvsp[0].dval);
 	}
     break;
 
@@ -1390,20 +1511,20 @@ yyreduce:
 #line 244 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_level %d %f\n", yyvsp[-1].ival, yyvsp[0].dval);
-	  if (yyvsp[-1].ival >= 0 && yyvsp[-1].ival <= STP_CHANNEL_LIMIT)
-	    global_levels[yyvsp[-1].ival] = yyvsp[0].dval;
+	    fprintf(stderr, ">>>channel_level %d %f\n", (yyvsp[-1].ival), (yyvsp[0].dval));
+	  if ((yyvsp[-1].ival) >= 0 && (yyvsp[-1].ival) <= STP_CHANNEL_LIMIT)
+	    global_levels[(yyvsp[-1].ival)] = (yyvsp[0].dval);
 	}
     break;
 
   case 27:
 #line 253 "testpatterny.y"
     {
-	  int channel = find_color(yyvsp[-1].sval);
+	  int channel = find_color((yyvsp[-1]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>gamma %s %f\n", yyvsp[-1].sval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>gamma %s %f\n", (yyvsp[-1]).sval, (yyvsp[0].dval));
 	  if (channel >= 0)
-	    global_gammas[channel] = yyvsp[0].dval;
+	    global_gammas[channel] = (yyvsp[0].dval);
 	}
     break;
 
@@ -1411,9 +1532,9 @@ yyreduce:
 #line 263 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>channel_gamma %d %f\n", yyvsp[-1].ival, yyvsp[0].dval);
-	  if (yyvsp[-1].ival >= 0 && yyvsp[-1].ival <= STP_CHANNEL_LIMIT)
-	    global_gammas[yyvsp[-1].ival] = yyvsp[0].dval;
+	    fprintf(stderr, ">>>channel_gamma %d %f\n", (yyvsp[-1].ival), (yyvsp[0].dval));
+	  if ((yyvsp[-1].ival) >= 0 && (yyvsp[-1].ival) <= STP_CHANNEL_LIMIT)
+	    global_gammas[(yyvsp[-1].ival)] = (yyvsp[0].dval);
 	}
     break;
 
@@ -1421,8 +1542,8 @@ yyreduce:
 #line 272 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>global_gamma %f\n", yyvsp[0].dval);
-	  global_gamma = yyvsp[0].dval;
+	    fprintf(stderr, ">>>global_gamma %f\n", (yyvsp[0].dval));
+	  global_gamma = (yyvsp[0].dval);
 	}
     break;
 
@@ -1430,8 +1551,8 @@ yyreduce:
 #line 279 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>steps %d\n", yyvsp[0].ival);
-	  global_steps = yyvsp[0].ival;
+	    fprintf(stderr, ">>>steps %d\n", (yyvsp[0].ival));
+	  global_steps = (yyvsp[0].ival);
 	}
     break;
 
@@ -1439,8 +1560,8 @@ yyreduce:
 #line 286 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>ink_limit %f\n", yyvsp[0].dval);
-	  global_ink_limit = yyvsp[0].dval;
+	    fprintf(stderr, ">>>ink_limit %f\n", (yyvsp[0].dval));
+	  global_ink_limit = (yyvsp[0].dval);
 	}
     break;
 
@@ -1448,9 +1569,9 @@ yyreduce:
 #line 293 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>printer %s\n", yyvsp[0].sval);
-	  global_printer = strdup(yyvsp[0].sval);
-	  free(yyvsp[0].sval);
+	    fprintf(stderr, ">>>printer %s\n", (yyvsp[0].sval));
+	  global_printer = strdup((yyvsp[0].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
@@ -1458,9 +1579,9 @@ yyreduce:
 #line 302 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>page_size_name %s\n", yyvsp[0].sval);
-	  stp_set_string_parameter(global_vars, "PageSize", yyvsp[0].sval);
-	  free(yyvsp[0].sval);
+	    fprintf(stderr, ">>>page_size_name %s\n", (yyvsp[0].sval));
+	  stp_set_string_parameter(global_vars, "PageSize", (yyvsp[0].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
@@ -1468,9 +1589,9 @@ yyreduce:
 #line 311 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>page_size_custom %d %d\n", yyvsp[-1].ival, yyvsp[0].ival);
-	  stp_set_page_width(global_vars, yyvsp[-1].ival);
-	  stp_set_page_height(global_vars, yyvsp[0].ival);
+	    fprintf(stderr, ">>>page_size_custom %d %d\n", (yyvsp[-1].ival), (yyvsp[0].ival));
+	  stp_set_page_width(global_vars, (yyvsp[-1].ival));
+	  stp_set_page_height(global_vars, (yyvsp[0].ival));
 	}
     break;
 
@@ -1478,10 +1599,10 @@ yyreduce:
 #line 323 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_string %s %s\n", yyvsp[-1].sval, yyvsp[0].sval);
-	  stp_set_string_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	    fprintf(stderr, ">>>parameter_string %s %s\n", (yyvsp[-1].sval), (yyvsp[0].sval));
+	  stp_set_string_parameter(global_vars, (yyvsp[-1].sval), (yyvsp[0].sval));
+	  free((yyvsp[-1].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
@@ -1489,9 +1610,9 @@ yyreduce:
 #line 333 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_int %s %d\n", yyvsp[-1].sval, yyvsp[0].ival);
-	  stp_set_int_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].ival);
-	  free(yyvsp[-1].sval);
+	    fprintf(stderr, ">>>parameter_int %s %d\n", (yyvsp[-1].sval), (yyvsp[0].ival));
+	  stp_set_int_parameter(global_vars, (yyvsp[-1].sval), (yyvsp[0].ival));
+	  free((yyvsp[-1].sval));
 	}
     break;
 
@@ -1499,9 +1620,9 @@ yyreduce:
 #line 342 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>parameter_float %s %f\n", yyvsp[-1].sval, yyvsp[0].dval);
-	  stp_set_float_parameter(global_vars, yyvsp[-1].sval, yyvsp[0].dval);
-	  free(yyvsp[-1].sval);
+	    fprintf(stderr, ">>>parameter_float %s %f\n", (yyvsp[-1].sval), (yyvsp[0].dval));
+	  stp_set_float_parameter(global_vars, (yyvsp[-1].sval), (yyvsp[0].dval));
+	  free((yyvsp[-1].sval));
 	}
     break;
 
@@ -1509,8 +1630,8 @@ yyreduce:
 #line 367 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>density %f\n", yyvsp[0].dval);
-	  global_density = yyvsp[0].dval;
+	    fprintf(stderr, ">>>density %f\n", (yyvsp[0].dval));
+	  global_density = (yyvsp[0].dval);
 	}
     break;
 
@@ -1518,8 +1639,8 @@ yyreduce:
 #line 374 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>top %f\n", yyvsp[0].dval);
-	  global_xtop = yyvsp[0].dval;
+	    fprintf(stderr, ">>>top %f\n", (yyvsp[0].dval));
+	  global_xtop = (yyvsp[0].dval);
 	}
     break;
 
@@ -1527,8 +1648,8 @@ yyreduce:
 #line 381 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>left %f\n", yyvsp[0].dval);
-	  global_xleft = yyvsp[0].dval;
+	    fprintf(stderr, ">>>left %f\n", (yyvsp[0].dval));
+	  global_xleft = (yyvsp[0].dval);
 	}
     break;
 
@@ -1536,8 +1657,8 @@ yyreduce:
 #line 388 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>hsize %f\n", yyvsp[0].dval);
-	  global_hsize = yyvsp[0].dval;
+	    fprintf(stderr, ">>>hsize %f\n", (yyvsp[0].dval));
+	  global_hsize = (yyvsp[0].dval);
 	}
     break;
 
@@ -1545,8 +1666,8 @@ yyreduce:
 #line 395 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>vsize %f\n", yyvsp[0].dval);
-	  global_vsize = yyvsp[0].dval;
+	    fprintf(stderr, ">>>vsize %f\n", (yyvsp[0].dval));
+	  global_vsize = (yyvsp[0].dval);
 	}
     break;
 
@@ -1554,8 +1675,8 @@ yyreduce:
 #line 402 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>blackline %d\n", yyvsp[0].ival);
-	  global_noblackline = !(yyvsp[0].ival);
+	    fprintf(stderr, ">>>blackline %d\n", (yyvsp[0].ival));
+	  global_noblackline = !((yyvsp[0].ival));
 	}
     break;
 
@@ -1563,13 +1684,13 @@ yyreduce:
 #line 410 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval,
+	    fprintf(stderr, ">>>color_block1 %f %f %f (%d)\n", (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval),
 		    current_index);
 	  if (current_index < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.p.mins[current_index] = yyvsp[-2].dval;
-	      current_testpattern->d.p.vals[current_index] = yyvsp[-1].dval;
-	      current_testpattern->d.p.gammas[current_index] = yyvsp[0].dval;
+	      current_testpattern->d.p.mins[current_index] = (yyvsp[-2].dval);
+	      current_testpattern->d.p.vals[current_index] = (yyvsp[-1].dval);
+	      current_testpattern->d.p.gammas[current_index] = (yyvsp[0].dval);
 	      current_index++;
 	    }
 	}
@@ -1578,14 +1699,14 @@ yyreduce:
   case 55:
 #line 434 "testpatterny.y"
     {
-	  int channel = find_color(yyvsp[-3].sval);
+	  int channel = find_color((yyvsp[-3]).sval);
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", yyvsp[-3].sval, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>color_block2a %s %f %f %f\n", (yyvsp[-3]).sval, (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval));
 	  if (channel >= 0 && channel < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.p.mins[channel] = yyvsp[-2].dval;
-	      current_testpattern->d.p.vals[channel] = yyvsp[-1].dval;
-	      current_testpattern->d.p.gammas[channel] = yyvsp[0].dval;
+	      current_testpattern->d.p.mins[channel] = (yyvsp[-2].dval);
+	      current_testpattern->d.p.vals[channel] = (yyvsp[-1].dval);
+	      current_testpattern->d.p.gammas[channel] = (yyvsp[0].dval);
 	    }
 	}
     break;
@@ -1594,12 +1715,12 @@ yyreduce:
 #line 448 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", yyvsp[-3].ival, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval);
-	  if (yyvsp[-3].ival >= 0 && yyvsp[-3].ival < STP_CHANNEL_LIMIT)
+	    fprintf(stderr, ">>>color_block2b %d %f %f %f\n", (yyvsp[-3].ival), (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval));
+	  if ((yyvsp[-3].ival) >= 0 && (yyvsp[-3].ival) < STP_CHANNEL_LIMIT)
 	    {
-	      current_testpattern->d.p.mins[yyvsp[-3].ival] = yyvsp[-2].dval;
-	      current_testpattern->d.p.vals[yyvsp[-3].ival] = yyvsp[-1].dval;
-	      current_testpattern->d.p.gammas[yyvsp[-3].ival] = yyvsp[0].dval;
+	      current_testpattern->d.p.mins[(yyvsp[-3].ival)] = (yyvsp[-2].dval);
+	      current_testpattern->d.p.vals[(yyvsp[-3].ival)] = (yyvsp[-1].dval);
+	      current_testpattern->d.p.gammas[(yyvsp[-3].ival)] = (yyvsp[0].dval);
 	    }
 	}
     break;
@@ -1608,13 +1729,13 @@ yyreduce:
 #line 473 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", yyvsp[-4].dval, yyvsp[-3].dval, yyvsp[-2].dval, yyvsp[-1].dval, yyvsp[0].dval);
+	    fprintf(stderr, ">>>patvars %f %f %f %f %f\n", (yyvsp[-4].dval), (yyvsp[-3].dval), (yyvsp[-2].dval), (yyvsp[-1].dval), (yyvsp[0].dval));
 	  current_testpattern->t = E_PATTERN;
-	  current_testpattern->d.p.lower = yyvsp[-4].dval;
-	  current_testpattern->d.p.upper = yyvsp[-3].dval;
-	  current_testpattern->d.p.levels[1] = yyvsp[-2].dval;
-	  current_testpattern->d.p.levels[2] = yyvsp[-1].dval;
-	  current_testpattern->d.p.levels[3] = yyvsp[0].dval;
+	  current_testpattern->d.p.lower = (yyvsp[-4].dval);
+	  current_testpattern->d.p.upper = (yyvsp[-3].dval);
+	  current_testpattern->d.p.levels[1] = (yyvsp[-2].dval);
+	  current_testpattern->d.p.levels[2] = (yyvsp[-1].dval);
+	  current_testpattern->d.p.levels[3] = (yyvsp[0].dval);
 	  current_testpattern = get_next_testpattern();
 	  current_index = 0;
 	}
@@ -1640,9 +1761,9 @@ yyreduce:
 #line 506 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>grid %d\n", yyvsp[0].ival);
+	    fprintf(stderr, ">>>grid %d\n", (yyvsp[0].ival));
 	  current_testpattern->t = E_GRID;
-	  current_testpattern->d.g.ticks = yyvsp[0].ival;
+	  current_testpattern->d.g.ticks = (yyvsp[0].ival);
 	  current_testpattern = get_next_testpattern();
 	  current_index = 0;
 	}
@@ -1652,10 +1773,10 @@ yyreduce:
 #line 517 "testpatterny.y"
     {
 	  if (getenv("STP_TESTPATTERN_DEBUG"))
-	    fprintf(stderr, ">>>image %d %d\n", yyvsp[-1].ival, yyvsp[0].ival);
+	    fprintf(stderr, ">>>image %d %d\n", (yyvsp[-1].ival), (yyvsp[0].ival));
 	  current_testpattern->t = E_IMAGE;
-	  current_testpattern->d.i.x = yyvsp[-1].ival;
-	  current_testpattern->d.i.y = yyvsp[0].ival;
+	  current_testpattern->d.i.x = (yyvsp[-1].ival);
+	  current_testpattern->d.i.y = (yyvsp[0].ival);
 	  if (current_testpattern->d.i.x <= 0 ||
 	      current_testpattern->d.i.y <= 0)
 	    {
@@ -1669,50 +1790,50 @@ yyreduce:
   case 70:
 #line 534 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[0].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, (yyvsp[0].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
   case 71:
 #line 540 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, (yyvsp[-1].sval), (yyvsp[0].sval));
+	  free((yyvsp[-1].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
   case 72:
 #line 547 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-2].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, (yyvsp[-2].sval), (yyvsp[-1].sval), (yyvsp[0].sval));
+	  free((yyvsp[-2].sval));
+	  free((yyvsp[-1].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
   case 73:
 #line 555 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-3].sval, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-3].sval);
-	  free(yyvsp[-2].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, (yyvsp[-3].sval), (yyvsp[-2].sval), (yyvsp[-1].sval), (yyvsp[0].sval));
+	  free((yyvsp[-3].sval));
+	  free((yyvsp[-2].sval));
+	  free((yyvsp[-1].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
   case 74:
 #line 564 "testpatterny.y"
     {
-	  fprintf(stderr, yyvsp[-4].sval, yyvsp[-3].sval, yyvsp[-2].sval, yyvsp[-1].sval, yyvsp[0].sval);
-	  free(yyvsp[-4].sval);
-	  free(yyvsp[-3].sval);
-	  free(yyvsp[-2].sval);
-	  free(yyvsp[-1].sval);
-	  free(yyvsp[0].sval);
+	  fprintf(stderr, (yyvsp[-4].sval), (yyvsp[-3].sval), (yyvsp[-2].sval), (yyvsp[-1].sval), (yyvsp[0].sval));
+	  free((yyvsp[-4].sval));
+	  free((yyvsp[-3].sval));
+	  free((yyvsp[-2].sval));
+	  free((yyvsp[-1].sval));
+	  free((yyvsp[0].sval));
 	}
     break;
 
@@ -1744,10 +1865,11 @@ yyreduce:
     break;
 
 
+      default: break;
     }
 
-/* Line 991 of yacc.c.  */
-#line 1750 "testpatterny.c"
+/* Line 1126 of yacc.c.  */
+#line 1873 "testpatterny.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1786,104 +1908,153 @@ yyerrlab:
 
       if (YYPACT_NINF < yyn && yyn < YYLAST)
 	{
-	  YYSIZE_T yysize = 0;
 	  int yytype = YYTRANSLATE (yychar);
-	  char *yymsg;
-	  int yyx, yycount;
+	  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+	  YYSIZE_T yysize = yysize0;
+	  YYSIZE_T yysize1;
+	  int yysize_overflow = 0;
+	  char *yymsg = 0;
+#	  define YYERROR_VERBOSE_ARGS_MAXIMUM 5
+	  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+	  int yyx;
+
+#if 0
+	  /* This is so xgettext sees the translatable formats that are
+	     constructed on the fly.  */
+	  YY_("syntax error, unexpected %s");
+	  YY_("syntax error, unexpected %s, expecting %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+	  YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+	  char *yyfmt;
+	  char const *yyf;
+	  static char const yyunexpected[] = "syntax error, unexpected %s";
+	  static char const yyexpecting[] = ", expecting %s";
+	  static char const yyor[] = " or %s";
+	  char yyformat[sizeof yyunexpected
+			+ sizeof yyexpecting - 1
+			+ ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+			   * (sizeof yyor - 1))];
+	  char const *yyprefix = yyexpecting;
 
-	  yycount = 0;
 	  /* Start YYX at -YYN if negative to avoid negative indexes in
 	     YYCHECK.  */
-	  for (yyx = yyn < 0 ? -yyn : 0;
-	       yyx < (int) (sizeof (yytname) / sizeof (char *)); yyx++)
+	  int yyxbegin = yyn < 0 ? -yyn : 0;
+
+	  /* Stay within bounds of both yycheck and yytname.  */
+	  int yychecklim = YYLAST - yyn;
+	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+	  int yycount = 1;
+
+	  yyarg[0] = yytname[yytype];
+	  yyfmt = yystpcpy (yyformat, yyunexpected);
+
+	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
 	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	      yysize += yystrlen (yytname[yyx]) + 15, yycount++;
-	  yysize += yystrlen ("syntax error, unexpected ") + 1;
-	  yysize += yystrlen (yytname[yytype]);
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
+	      {
+		if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+		  {
+		    yycount = 1;
+		    yysize = yysize0;
+		    yyformat[sizeof yyunexpected - 1] = '\0';
+		    break;
+		  }
+		yyarg[yycount++] = yytname[yyx];
+		yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+		yysize_overflow |= yysize1 < yysize;
+		yysize = yysize1;
+		yyfmt = yystpcpy (yyfmt, yyprefix);
+		yyprefix = yyor;
+	      }
+
+	  yyf = YY_(yyformat);
+	  yysize1 = yysize + yystrlen (yyf);
+	  yysize_overflow |= yysize1 < yysize;
+	  yysize = yysize1;
+
+	  if (!yysize_overflow && yysize <= YYSTACK_ALLOC_MAXIMUM)
+	    yymsg = (char *) YYSTACK_ALLOC (yysize);
+	  if (yymsg)
 	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
-
-	      if (yycount < 5)
+	      /* Avoid sprintf, as that infringes on the user's name space.
+		 Don't have undefined behavior even if the translation
+		 produced a string with the wrong number of "%s"s.  */
+	      char *yyp = yymsg;
+	      int yyi = 0;
+	      while ((*yyp = *yyf))
 		{
-		  yycount = 0;
-		  for (yyx = yyn < 0 ? -yyn : 0;
-		       yyx < (int) (sizeof (yytname) / sizeof (char *));
-		       yyx++)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			const char *yyq = ! yycount ? ", expecting " : " or ";
-			yyp = yystpcpy (yyp, yyq);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yycount++;
-		      }
+		  if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		    {
+		      yyp += yytnamerr (yyp, yyarg[yyi++]);
+		      yyf += 2;
+		    }
+		  else
+		    {
+		      yyp++;
+		      yyf++;
+		    }
 		}
 	      yyerror (yymsg);
 	      YYSTACK_FREE (yymsg);
 	    }
 	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
+	    {
+	      yyerror (YY_("syntax error"));
+	      goto yyexhaustedlab;
+	    }
 	}
       else
 #endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	yyerror (YY_("syntax error"));
     }
 
 
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse lookahead token after an
+      /* If just tried and failed to reuse look-ahead token after an
 	 error, discard it.  */
 
-      /* Return failure if at end of input.  */
-      if (yychar == YYEOF)
+      if (yychar <= YYEOF)
         {
-	  /* Pop the error token.  */
-          YYPOPSTACK;
-	  /* Pop the rest of the stack.  */
-	  while (yyss < yyssp)
-	    {
-	      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-	      yydestruct (yystos[*yyssp], yyvsp);
-	      YYPOPSTACK;
-	    }
-	  YYABORT;
+	  /* Return failure if at end of input.  */
+	  if (yychar == YYEOF)
+	    YYABORT;
         }
-
-      YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
-      yydestruct (yytoken, &yylval);
-      yychar = YYEMPTY;
-
+      else
+	{
+	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yychar = YYEMPTY;
+	}
     }
 
-  /* Else will try to reuse lookahead token after shifting the error
+  /* Else will try to reuse look-ahead token after shifting the error
      token.  */
-  goto yyerrlab2;
+  goto yyerrlab1;
 
 
-/*----------------------------------------------------.
-| yyerrlab1 -- error raised explicitly by an action.  |
-`----------------------------------------------------*/
-yyerrlab1:
-
-  /* Suppress GCC warning that yyerrlab1 is unused when no action
-     invokes YYERROR.  */
-#if defined (__GNUC_MINOR__) && 2093 <= (__GNUC__ * 1000 + __GNUC_MINOR__) \
-    && !defined __cplusplus
-  __attribute__ ((__unused__))
-#endif
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
 
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (0)
+     goto yyerrorlab;
 
-  goto yyerrlab2;
+yyvsp -= yylen;
+  yyssp -= yylen;
+  yystate = *yyssp;
+  goto yyerrlab1;
 
 
-/*---------------------------------------------------------------.
-| yyerrlab2 -- pop states until the error token can be shifted.  |
-`---------------------------------------------------------------*/
-yyerrlab2:
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
   yyerrstatus = 3;	/* Each real token shifted decrements this.  */
 
   for (;;)
@@ -1904,22 +2075,22 @@ yyerrlab2:
       if (yyssp == yyss)
 	YYABORT;
 
-      YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
-      yydestruct (yystos[yystate], yyvsp);
-      yyvsp--;
-      yystate = *--yyssp;
 
+      yydestruct ("Error: popping", yystos[yystate], yyvsp);
+      YYPOPSTACK;
+      yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
   if (yyn == YYFINAL)
     YYACCEPT;
 
-  YYDPRINTF ((stderr, "Shifting error token, "));
-
   *++yyvsp = yylval;
 
 
+  /* Shift the error token. */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
   yystate = yyn;
   goto yynewstate;
 
@@ -1939,16 +2110,25 @@ yyabortlab:
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK;
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
diff --git a/src/testpattern/testpatterny.h b/src/testpattern/testpatterny.h
index 2567b82..3b0a9f4 100644
--- a/src/testpattern/testpatterny.h
+++ b/src/testpattern/testpatterny.h
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 1.875.  */
+/* A Bison parser, made by GNU Bison 2.1.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
    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
@@ -15,8 +15,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, when this file is copied by Bison into a
    Bison output file, you may use that output file without restriction.
@@ -75,6 +75,7 @@
      END = 301
    };
 #endif
+/* Tokens.  */
 #define tINT 258
 #define tDOUBLE 259
 #define tSTRING 260
diff --git a/test/Makefile.am b/test/Makefile.am
index 3c7e2aa..a4a1d48 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.43 2004/09/17 18:38:27 rleigh Exp $
+## $Id: Makefile.am,v 1.44 2005/11/21 11:16:23 rleigh Exp $
 ## Copyright (C) 2000 Roger Leigh
 ##
 ## This program is free software; you can redistribute it and/or modify
@@ -17,12 +17,8 @@
 
 ## Process this file with automake to produce Makefile.in.
 
-AUTOMAKE_OPTIONS = 1.4 gnu
-
 @SET_MAKE@
 
-MAINT_CHARSET = latin1
-
 include $(top_srcdir)/scripts/global.mk
 
 
diff --git a/test/Makefile.in b/test/Makefile.in
index c4fc14e..7648c96 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -16,8 +16,6 @@
 
 # Variables
 
-SOURCES = $(bjc_unprint_SOURCES) $(curve_SOURCES) $(escp2_weavetest_SOURCES) $(pcl_unprint_SOURCES) $(testdither_SOURCES) $(unprint_SOURCES) $(xml_curve_SOURCES)
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -84,8 +82,8 @@ am_xml_curve_OBJECTS = xml-curve.$(OBJEXT)
 xml_curve_OBJECTS = $(am_xml_curve_OBJECTS)
 xml_curve_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
-am__depfiles_maybe = depfiles
+depcomp =
+am__depfiles_maybe =
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
@@ -105,8 +103,6 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -144,7 +140,6 @@ BUILD_TEST_TRUE = @BUILD_TEST_TRUE@
 BUILD_TRANSLATED_CUPS_PPDS_FALSE = @BUILD_TRANSLATED_CUPS_PPDS_FALSE@
 BUILD_TRANSLATED_CUPS_PPDS_TRUE = @BUILD_TRANSLATED_CUPS_PPDS_TRUE@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CONVERT = @CONVERT@
 CPP = @CPP@
@@ -157,14 +152,12 @@ CUPS_PPDS_AT_TOP_LEVEL_TRUE = @CUPS_PPDS_AT_TOP_LEVEL_TRUE@
 CUPS_PPD_PS_LEVEL = @CUPS_PPD_PS_LEVEL@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DB2HTML = @DB2HTML@
 DB2PDF = @DB2PDF@
 DB2PS = @DB2PS@
 DEFS = @DEFS@
-DEPDIR = @DEPDIR@
 DIALOG = @DIALOG@
 DOXYGEN = @DOXYGEN@
 DVIPDF = @DVIPDF@
@@ -299,13 +292,8 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
@@ -351,8 +339,6 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AUTOMAKE_OPTIONS = 1.4 gnu
-MAINT_CHARSET = latin1
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(LOCAL_CPPFLAGS) $(GNUCFLAGS)
 LOCAL_CPPFLAGS = -I$(top_srcdir)/src/main $(GUTENPRINT_CFLAGS)
 TESTS = curve run-testdither run-weavetest
@@ -388,9 +374,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps test/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  test/Makefile
+	  $(AUTOMAKE) --gnu  --ignore-deps test/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -443,34 +429,14 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bjc-unprint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/escp2-weavetest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcl-unprint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testdither.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unprint.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml-curve.Po@am__quote@
-
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -668,7 +634,6 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-libtool distclean-tags
@@ -694,7 +659,6 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/test/unprint.c b/test/unprint.c
index 6df4b81..aed2c65 100644
--- a/test/unprint.c
+++ b/test/unprint.c
@@ -1,4 +1,4 @@
-/* $Id: unprint.c,v 1.35 2004/09/17 18:38:28 rleigh Exp $ */
+/* $Id: unprint.c,v 1.36 2005/10/23 19:43:14 rlk Exp $ */
 /*
  * Generate PPM files from printer output
  *
@@ -87,7 +87,7 @@ typedef struct {
  * actually read in the data.  This optimization may be worthwhile.
  */
 
-#define MAX_INKS 11
+#define MAX_INKS 12
 typedef struct {
    unsigned char *line[MAX_INKS];
    int startx[MAX_INKS];
@@ -127,6 +127,7 @@ line_type **page=NULL;
    Blue     8       N/A      9
    P.Black  64      N/A      0
    Gloss    9       N/A      10
+   LL.Black 48      768      11
  */
 
 /* convert either Epson1 or Epson2 color encoding into a sequential encoding */
@@ -162,6 +163,9 @@ seqcolor(int c)
       return 9;
     case 9:
       return 10;
+    case 48:
+    case 768:
+      return 11;
     default:
       return 0;
     }
@@ -280,6 +284,7 @@ static float ink_colors[MAX_INKS][4] =
  { 1,   0,  0,  1 },		/* R */
  { 0,   0,  1,  1 },		/* B */
  { 1,   1,  1,  1 },		/* Gloss */
+ { .8, .8, .8,  1 },		/* llk */
 };
 
 static float quadtone_inks[] = { 0.0, .25, .5, .75 };